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.229 by root, Sat May 3 12:29:09 2008 UTC vs.
Revision 1.356 by root, Mon Nov 12 03:48:34 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->name != ob2->arch->name	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
215	|| ob1->weight != ob2->weight	307	|| ob1->weight != ob2->weight
216	|| ob1->attacktype != ob2->attacktype	308	|| ob1->attacktype != ob2->attacktype
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
		314	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
222	|| ob1->client_type != ob2->client_type	315	|| ob1->client_type != ob2->client_type
223	|| ob1->materialname != ob2->materialname	316	|| ob1->material != ob2->material
224	|| ob1->lore != ob2->lore	317	|| ob1->lore != ob2->lore
225	|| ob1->subtype != ob2->subtype	318	|| ob1->subtype != ob2->subtype
226	|| ob1->move_type != ob2->move_type	319	|| ob1->move_type != ob2->move_type
227	|| ob1->move_block != ob2->move_block	320	|| ob1->move_block != ob2->move_block
228	|| ob1->move_allow != ob2->move_allow	321	|| ob1->move_allow != ob2->move_allow
229	|| ob1->move_on != ob2->move_on	322	|| ob1->move_on != ob2->move_on
230	|| ob1->move_off != ob2->move_off	323	|| ob1->move_off != ob2->move_off
231	|| ob1->move_slow != ob2->move_slow	324	|| ob1->move_slow != ob2->move_slow
232	|| ob1->move_slow_penalty != ob2->move_slow_penalty	325	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	326	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	327	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	328	return 0;
236		329
237	if ((ob1->flag ^ ob2->flag)	330	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	331	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	332	.reset (FLAG_REMOVED)
241	.any ())	333	.any ())
242	return 0;	334	return 0;
243		335
244	/* This is really a spellbook check - we should in general	336	/* This is really a spellbook check - we should in general
…		…
263		355
264	/* 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,
265	* 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
266	* some items equipped, and we don't want those to merge.	358	* some items equipped, and we don't want those to merge.
267	*/	359	*/
268	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	360	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
269	return 0;	361	return 0;
270		362
271	/* 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
272	* 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
273	* check?	365	* check?
274	*/	366	*/
275	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	367	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
276	return 0;	368	return 0;
277		369
278	switch (ob1->type)	370	switch (ob1->type)
279	{	371	{
280	case SCROLL:	372	case SCROLL:
281	if (ob1->level != ob2->level)	373	if (ob1->level != ob2->level)
282	return 0;	374	return 0;
283	break;	375	break;
284	}	376	}
285		377
286	if (ob1->key_values || ob2->key_values)	378	if (!ob1->kv.empty () || !ob2->kv.empty ())
287	{	379	{
288	/* At least one of these has key_values. */	380	/* At least one of these has key_values. */
289	if ((!ob1->key_values) != (!ob2->key_values))	381	if (ob1->kv.empty () != ob2->kv.empty ())
290	return 0; /* One has fields, but the other one doesn't. */	382	return 0; /* One has fields, but the other one doesn't. */
291		383
292	if (!compare_ob_value_lists (ob1, ob2))	384	if (!compare_ob_value_lists (ob1, ob2))
293	return 0;	385	return 0;
294	}	386	}
…		…
326	{	418	{
327	// see if we are in a container of sorts	419	// see if we are in a container of sorts
328	if (env)	420	if (env)
329	{	421	{
330	// the player inventory itself is always visible	422	// the player inventory itself is always visible
331	if (env->type == PLAYER)	423	if (env->is_player ())
332	return env;	424	return env;
333		425
334	// else a player could have our env open	426	// else a player could have our env open
335	object *envest = env->outer_env ();	427	object *envest = env->outer_env_or_self ();
336		428
337	// 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
338	// even if our inv is in a player.	430	// even if our inv is in a player.
339	if (envest->is_on_map ())	431	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	432	if (object *pl = envest->ms ().player ())
341	if (pl->container == env)	433	if (pl->container_ () == env)
342	return pl;	434	return pl;
343	}	435	}
344	else	436	else
345	{	437	{
346	// maybe there is a player standing on the same mapspace	438	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	439	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	440	if (object *pl = ms ().player ())
349	if (!pl->container || this == pl->container)	441	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		442	|| pl->container_ () == this)
350	return pl;	443	return pl;
351	}	444	}
352	}	445	}
353		446
354	return 0;	447	return 0;
355	}	448	}
356		449
357	// adjust weight per container type ("of holding")	450	// adjust weight per container type ("of holding")
358	static sint32	451	static weight_t
359	weight_adjust (object *op, sint32 weight)	452	weight_adjust_for (object *op, weight_t weight)
360	{	453	{
361	return op->type == CONTAINER	454	if (op->type == CONTAINER)
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	455	weight -= weight * op->stats.Str / 100;
363	: weight;
364	}
365		456
		457	return weight;
		458	}
		459
366	/*	460	/*
367	* adjust_weight(object, weight) adds the specified weight to an object,	461	* subtracts, then adds, the specified weight to an object,
368	* and also updates how much the environment(s) is/are carrying.	462	* and also updates how much the environment(s) is/are carrying.
369	*/	463	*/
370	static void	464	static void
371	adjust_weight (object *op, sint32 weight)	465	adjust_weight (object *op, weight_t sub, weight_t add)
372	{	466	{
373	while (op)	467	while (op)
374	{	468	{
375	weight = weight_adjust (op, weight);	469	weight_t carrying = op->carrying
		470	- weight_adjust_for (op, sub);
		471	+ weight_adjust_for (op, add);
376		472
377	if (!weight)	473	sub = op->carrying;
378	return;
379
380	op->carrying += weight;	474	op->carrying = carrying;
		475	add = op->carrying;
381		476
382	if (object *pl = op->visible_to ())	477	if (object *pl = op->visible_to ())
383	if (pl != op) // player is handled lazily	478	if (pl != op) // player is handled lazily
384	esrv_update_item (UPD_WEIGHT, pl, op);	479	esrv_update_item (UPD_WEIGHT, pl, op);
385		480
…		…
393	* containers are carrying, and sums it up.	488	* containers are carrying, and sums it up.
394	*/	489	*/
395	void	490	void
396	object::update_weight ()	491	object::update_weight ()
397	{	492	{
398	sint32 sum = 0;	493	weight_t sum = 0;
399		494
400	for (object *op = inv; op; op = op->below)	495	for (object *op = inv; op; op = op->below)
401	{	496	{
402	if (op->inv)
403	op->update_weight ();	497	op->update_weight ();
404		498
405	sum += op->total_weight ();	499	sum += weight_adjust_for (this, op->total_weight ());
406	}	500	}
407
408	sum = weight_adjust (this, sum);
409		501
410	if (sum != carrying)	502	if (sum != carrying)
411	{	503	{
		504	if (carrying != sum && carrying)//D
		505	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		506	(long long)sum, (long long)carrying, debug_desc ());
		507
412	carrying = sum;	508	carrying = sum;
413		509
414	if (object *pl = visible_to ())	510	if (object *pl = visible_to ())
415	if (pl != this) // player is handled lazily	511	if (pl != this) // player is handled lazily
416	esrv_update_item (UPD_WEIGHT, pl, this);	512	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
429	object_freezer freezer;	525	object_freezer freezer;
430	op->write (freezer);	526	op->write (freezer);
431	return freezer.as_string ();	527	return freezer.as_string ();
432	}	528	}
433		529
434	/*	530	char *
435	* get_nearest_part(multi-object, object 2) returns the part of the	531	object::as_string ()
436	* multi-object 1 which is closest to the second object.
437	* If it's not a multi-object, it is returned.
438	*/
439	object *
440	get_nearest_part (object *op, const object *pl)
441	{	532	{
442	object *tmp, *closest;	533	return dump_object (this);
443	int last_dist, i;
444
445	if (!op->more)
446	return op;
447
448	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
449	tmp;
450	tmp = tmp->more)
451	if ((i = distance (tmp, pl)) < last_dist)
452	closest = tmp, last_dist = i;
453
454	return closest;
455	}	534	}
456		535
457	/*	536	/*
458	* Returns the object which has the count-variable equal to the argument.	537	* Returns the object which has the count-variable equal to the argument.
459	* VERRRY slow.	538	* VERRRY slow.
…		…
467		546
468	return 0;	547	return 0;
469	}	548	}
470		549
471	/*	550	/*
		551	* Returns the object which has the uuid equal to the argument.
		552	* MOAR VERRRY slow.
		553	*/
		554
		555	object *
		556	find_object_uuid (UUID i)
		557	{
		558	for_all_objects (op)
		559	if (op->uuid == i)
		560	return op;
		561
		562	return 0;
		563	}
		564
		565	/*
472	* Returns the first object which has a name equal to the argument.	566	* Returns the first object which has a name equal to the argument.
473	* Used only by the patch command, but not all that useful.	567	* Used only by the patch command, but not all that useful.
474	* Enables features like "patch <name-of-other-player> food 999"	568	* Enables features like "patch <name-of-other-player> food 999"
475	*/	569	*/
476	object *	570	object *
477	find_object_name (const char *str)	571	find_object_name (const char *str)
478	{	572	{
479	shstr_cmp str_ (str);	573	shstr_cmp str_ (str);
480	object *op;
481		574
		575	if (str_)
482	for_all_objects (op)	576	for_all_objects (op)
483	if (op->name == str_)	577	if (op->name == str_)
484	break;	578	return op;
485		579
486	return op;	580	return 0;
487	}	581	}
488		582
489	/*	583	/*
490	* Sets the owner and sets the skill and exp pointers to owner's current	584	* Sets the owner and sets the skill and exp pointers to owner's current
491	* skill and experience objects.	585	* skill and experience objects.
…		…
504	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	598	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
505	return;	599	return;
506	}	600	}
507		601
508	this->owner = owner;	602	this->owner = owner;
509	}
510
511	int
512	object::slottype () const
513	{
514	if (type == SKILL)
515	{
516	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
517	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
518	}
519	else
520	{
521	if (slot [body_combat].info) return slot_combat;
522	if (slot [body_range ].info) return slot_ranged;
523	}
524
525	return slot_none;
526	}
527
528	bool
529	object::change_weapon (object *ob)
530	{
531	if (current_weapon == ob)
532	return true;
533
534	if (chosen_skill)
535	chosen_skill->flag [FLAG_APPLIED] = false;
536
537	current_weapon = ob;
538	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
539
540	if (chosen_skill)
541	chosen_skill->flag [FLAG_APPLIED] = true;
542
543	update_stats ();
544
545	if (ob)
546	{
547	// now check wether any body locations became invalid, in which case
548	// we cannot apply the weapon at the moment.
549	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
550	if (slot[i].used < 0)
551	{
552	current_weapon = chosen_skill = 0;
553	update_stats ();
554
555	new_draw_info_format (NDI_UNIQUE, 0, this,
556	"You try to balance all your items at once, "
557	"but the %s is just too much for your body. "
558	"[You need to unapply some items first.]", &ob->name);
559	return false;
560	}
561
562	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
563	}
564	else
565	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
566
567	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
568	{
569	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
570	&name, ob->debug_desc ());
571	return false;
572	}
573
574	return true;
575	}
576
577	/* Zero the key_values on op, decrementing the shared-string
578	* refcounts and freeing the links.
579	*/
580	static void
581	free_key_values (object *op)
582	{
583	for (key_value *i = op->key_values; i; )
584	{
585	key_value *next = i->next;
586	delete i;
587
588	i = next;
589	}
590
591	op->key_values = 0;
592	}	603	}
593		604
594	/*	605	/*
595	* copy_to first frees everything allocated by the dst object,	606	* copy_to first frees everything allocated by the dst object,
596	* and then copies the contents of itself into the second	607	* and then copies the contents of itself into the second
…		…
602	void	613	void
603	object::copy_to (object *dst)	614	object::copy_to (object *dst)
604	{	615	{
605	dst->remove ();	616	dst->remove ();
606	*(object_copy *)dst = *this;	617	*(object_copy *)dst = *this;
		618
		619	// maybe move to object_copy?
		620	dst->kv = kv;
		621
607	dst->flag [FLAG_REMOVED] = true;	622	dst->flag [FLAG_REMOVED] = true;
608		623	dst->activate ();
609	/* Copy over key_values, if any. */
610	if (key_values)
611	{
612	key_value *tail = 0;
613	dst->key_values = 0;
614
615	for (key_value *i = key_values; i; i = i->next)
616	{
617	key_value *new_link = new key_value;
618
619	new_link->next = 0;
620	new_link->key = i->key;
621	new_link->value = i->value;
622
623	/* Try and be clever here, too. */
624	if (!dst->key_values)
625	{
626	dst->key_values = new_link;
627	tail = new_link;
628	}
629	else
630	{
631	tail->next = new_link;
632	tail = new_link;
633	}
634	}
635	}
636
637	if (speed < 0)
638	dst->speed_left -= rndm ();
639
640	dst->set_speed (dst->speed);
641	}	624	}
642		625
643	void	626	void
644	object::instantiate ()	627	object::instantiate ()
645	{	628	{
646	if (!uuid.seq) // HACK	629	if (!uuid.seq) // HACK
647	uuid = UUID::gen ();	630	uuid = UUID::gen ();
648		631
		632	// TODO: unclean state changes, should not be done in copy_to AND instantiate
		633	if (flag [FLAG_RANDOM_SPEED] && speed)
		634	speed_left = - speed - rndm (); // TODO animation
		635	else
649	speed_left = -0.1f;	636	speed_left = -1.;
		637
650	/* copy the body_info to the body_used - this is only really	638	/* copy the body_info to the body_used - this is only really
651	* need for monsters, but doesn't hurt to do it for everything.	639	* need for monsters, but doesn't hurt to do it for everything.
652	* by doing so, when a monster is created, it has good starting	640	* by doing so, when a monster is created, it has good starting
653	* values for the body_used info, so when items are created	641	* values for the body_used info, so when items are created
654	* for it, they can be properly equipped.	642	* for it, they can be properly equipped.
…		…
662	object *	650	object *
663	object::clone ()	651	object::clone ()
664	{	652	{
665	object *neu = create ();	653	object *neu = create ();
666	copy_to (neu);	654	copy_to (neu);
		655
		656	// TODO: unclean state changes, should not be done in clone AND instantiate
		657	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		658	neu->speed_left = - neu->speed - rndm (); // TODO animation
		659
667	neu->map = map; // not copied by copy_to	660	neu->map = map; // not copied by copy_to
668	return neu;	661	return neu;
669	}	662	}
670		663
671	/*	664	/*
…		…
674	* be called to update the face variable, _and_ how it looks on the map.	667	* be called to update the face variable, _and_ how it looks on the map.
675	*/	668	*/
676	void	669	void
677	update_turn_face (object *op)	670	update_turn_face (object *op)
678	{	671	{
679	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	672	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
680	return;	673	return;
681		674
682	SET_ANIMATION (op, op->direction);	675	SET_ANIMATION (op, op->direction);
683	update_object (op, UP_OBJ_FACE);	676	update_object (op, UP_OBJ_FACE);
684	}	677	}
…		…
689	* This function needs to be called whenever the speed of an object changes.	682	* This function needs to be called whenever the speed of an object changes.
690	*/	683	*/
691	void	684	void
692	object::set_speed (float speed)	685	object::set_speed (float speed)
693	{	686	{
694	if (flag [FLAG_FREED] && speed)
695	{
696	LOG (llevError, "Object %s is freed but has speed.\n", &name);
697	speed = 0;
698	}
699
700	this->speed = speed;	687	this->speed = speed;
701		688
702	if (has_active_speed ())	689	if (has_active_speed ())
703	activate ();	690	activate ();
704	else	691	else
…		…
751	}	738	}
752		739
753	mapspace &m = op->ms ();	740	mapspace &m = op->ms ();
754		741
755	if (!(m.flags_ & P_UPTODATE))	742	if (!(m.flags_ & P_UPTODATE))
756	/* nop */;	743	m.update_up (); // nothing to do except copy up
757	else if (action == UP_OBJ_INSERT)	744	else if (action == UP_OBJ_INSERT)
758	{	745	{
		746	#if 0
759	// this is likely overkill, TODO: revisit (schmorp)	747	// this is likely overkill, TODO: revisit (schmorp)
760	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	748	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
761	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	749	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
762	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	750	|| (op->is_player () && !(m.flags_ & P_PLAYER))
763	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	751	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
764	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	752	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
765	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	753	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
766	|| (m.move_on | op->move_on ) != m.move_on	754	|| (m.move_on | op->move_on ) != m.move_on
767	|| (m.move_off | op->move_off ) != m.move_off	755	|| (m.move_off | op->move_off ) != m.move_off
768	|| (m.move_slow | op->move_slow) != m.move_slow	756	|| (m.move_slow | op->move_slow) != m.move_slow
769	/* This isn't perfect, but I don't expect a lot of objects to	757	/* This isn't perfect, but I don't expect a lot of objects to
770	* to have move_allow right now.	758	* have move_allow right now.
771	*/	759	*/
772	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	760	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		761	m.invalidate ();
		762	#else
773	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	763	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
774	m.flags_ = 0;	764	m.invalidate ();
		765	#endif
775	}	766	}
776	/* if the object is being removed, we can't make intelligent	767	/* if the object is being removed, we can't make intelligent
777	* decisions, because remove_ob can't really pass the object	768	* decisions, because remove_ob can't really pass the object
778	* that is being removed.	769	* that is being removed.
779	*/	770	*/
780	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	771	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
781	m.flags_ = 0;	772	m.invalidate ();
782	else if (action == UP_OBJ_FACE)	773	else if (action == UP_OBJ_FACE)
783	/* Nothing to do for that case */ ;	774	m.update_up (); // nothing to do for that case, except copy up
784	else	775	else
785	LOG (llevError, "update_object called with invalid action: %d\n", action);	776	LOG (llevError, "update_object called with invalid action: %d\n", action);
786		777
787	if (op->more)	778	if (op->more)
788	update_object (op->more, action);	779	update_object (op->more, action);
789	}	780	}
790		781
791	object::object ()	782	object::object ()
792	{	783	{
793	SET_FLAG (this, FLAG_REMOVED);	784	this->set_flag (FLAG_REMOVED);
794		785
795	expmul = 1.0;	786	//expmul = 1.0; declared const for the time being
796	face = blank_face;	787	face = blank_face;
		788	material = MATERIAL_NULL;
797	}	789	}
798		790
799	object::~object ()	791	object::~object ()
800	{	792	{
801	unlink ();	793	unlink ();
802		794
803	free_key_values (this);	795	kv.clear ();
804	}	796	}
805
806	static int object_count;
807		797
808	void object::link ()	798	void object::link ()
809	{	799	{
810	assert (!index);//D	800	assert (!index);//D
811	uuid = UUID::gen ();	801	uuid = UUID::gen ();
812	count = ++object_count;
813		802
814	refcnt_inc ();	803	refcnt_inc ();
815	objects.insert (this);	804	objects.insert (this);
		805
		806	++create_count;
		807
816	}	808	}
817		809
818	void object::unlink ()	810	void object::unlink ()
819	{	811	{
820	if (!index)	812	if (!index)
821	return;	813	return;
		814
		815	++destroy_count;
822		816
823	objects.erase (this);	817	objects.erase (this);
824	refcnt_dec ();	818	refcnt_dec ();
825	}	819	}
826		820
…		…
830	/* If already on active list, don't do anything */	824	/* If already on active list, don't do anything */
831	if (active)	825	if (active)
832	return;	826	return;
833		827
834	if (has_active_speed ())	828	if (has_active_speed ())
		829	{
		830	if (flag [FLAG_FREED])
		831	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		832
835	actives.insert (this);	833	actives.insert (this);
		834	}
836	}	835	}
837		836
838	void	837	void
839	object::activate_recursive ()	838	object::activate_recursive ()
840	{	839	{
…		…
900	* if some form of movement is allowed, let objects	899	* if some form of movement is allowed, let objects
901	* drop on that space.	900	* drop on that space.
902	*/	901	*/
903	if (!drop_to_ground	902	if (!drop_to_ground
904	|| !map	903	|| !map
905	|| map->in_memory != MAP_ACTIVE	904	|| !map->linkable ()
906	|| map->nodrop	905	|| map->no_drop
907	|| ms ().move_block == MOVE_ALL)	906	|| ms ().move_block == MOVE_ALL)
908	{	907	{
909	while (inv)	908	while (inv)
910	{
911	inv->destroy_inv (false);
912	inv->destroy ();	909	inv->destroy ();
913	}
914	}	910	}
915	else	911	else
916	{ /* Put objects in inventory onto this space */	912	{ /* Put objects in inventory onto this space */
917	while (inv)	913	while (inv)
918	{	914	{
…		…
922	|| op->flag [FLAG_NO_DROP]	918	|| op->flag [FLAG_NO_DROP]
923	|| op->type == RUNE	919	|| op->type == RUNE
924	|| op->type == TRAP	920	|| op->type == TRAP
925	|| op->flag [FLAG_IS_A_TEMPLATE]	921	|| op->flag [FLAG_IS_A_TEMPLATE]
926	|| op->flag [FLAG_DESTROY_ON_DEATH])	922	|| op->flag [FLAG_DESTROY_ON_DEATH])
927	op->destroy (true);	923	op->destroy ();
928	else	924	else
929	map->insert (op, x, y);	925	map->insert (op, x, y);
930	}	926	}
931	}	927	}
932	}	928	}
933		929
		930	/*
		931	* Remove and free all objects in the inventory of the given object.
		932	* Unlike destroy_inv, this assumes the *this is destroyed as well
		933	* well, so we can (and have to!) take shortcuts.
		934	*/
		935	void
		936	object::destroy_inv_fast ()
		937	{
		938	while (object *op = inv)
		939	{
		940	// remove from object the fast way
		941	op->flag [FLAG_REMOVED] = true;
		942	op->env = 0;
		943	if ((inv = inv->below))
		944	inv->above = 0;
		945
		946	// then destroy
		947	op->destroy ();
		948	}
		949	}
		950
		951	void
		952	object::freelist_free (int count)
		953	{
		954	while (count-- && freelist)
		955	{
		956	freelist_item *next = freelist->next;
		957	// count is being "destroyed"
		958
		959	sfree ((char *)freelist, sizeof (object));
		960
		961	freelist = next;
		962	--free_count;
		963	}
		964	}
		965
		966	object *
934	object *object::create ()	967	object::create ()
935	{	968	{
936	object *op = new object;	969	object *op;
		970
		971	if (freelist)
		972	{
		973	freelist_item li = *freelist;
		974	memset (freelist, 0, sizeof (object));
		975
		976	op = new (freelist) object;
		977	op->count = li.count;
		978
		979	freelist = li.next;
		980	--free_count;
		981	}
		982	else
		983	{
		984	void *ni = salloc0<char> (sizeof (object));
		985
		986	op = new(ni) object;
		987
		988	op->count = ++object_count;
		989	}
		990
937	op->link ();	991	op->link ();
		992
938	return op;	993	return op;
939	}	994	}
940		995
941	static struct freed_map : maptile	996	void
		997	object::do_delete ()
942	{	998	{
943	freed_map ()	999	uint32_t count = this->count;
944	{
945	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";
947	width = 3;
948	height = 3;
949	nodrop = 1;
950		1000
951	alloc ();	1001	this->~object ();
952	in_memory = MAP_ACTIVE;
953	}
954		1002
955	~freed_map ()	1003	freelist_item *li = (freelist_item *)this;
956	{	1004	li->next = freelist;
957	destroy ();	1005	li->count = count;
958	}	1006
959	} freed_map; // freed objects are moved here to avoid crashes	1007	freelist = li;
		1008	++free_count;
		1009	}
960		1010
961	void	1011	void
962	object::do_destroy ()	1012	object::do_destroy ()
963	{	1013	{
964	if (flag [FLAG_IS_LINKED])	1014	if (flag [FLAG_IS_LINKED])
965	remove_button_link (this);	1015	remove_link ();
966		1016
967	if (flag [FLAG_FRIENDLY])	1017	if (flag [FLAG_FRIENDLY])
968	remove_friendly_object (this);	1018	remove_friendly_object (this);
969		1019
970	remove ();	1020	remove ();
…		…
995	attacked_by = 0;	1045	attacked_by = 0;
996	current_weapon = 0;	1046	current_weapon = 0;
997	}	1047	}
998		1048
999	void	1049	void
1000	object::destroy (bool destroy_inventory)	1050	object::destroy ()
1001	{	1051	{
1002	if (destroyed ())	1052	if (destroyed ())
1003	return;	1053	return;
1004		1054
1005	if (!is_head () && !head->destroyed ())	1055	if (!is_head () && !head->destroyed ())
1006	{	1056	{
1007	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1057	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1008	head->destroy (destroy_inventory);	1058	head->destroy ();
1009	return;	1059	return;
1010	}	1060	}
1011		1061
1012	destroy_inv (!destroy_inventory);	1062	destroy_inv_fast ();
1013		1063
1014	if (is_head ())	1064	if (is_head ())
1015	if (sound_destroy)	1065	if (sound_destroy)
1016	play_sound (sound_destroy);	1066	play_sound (sound_destroy);
1017	else if (flag [FLAG_MONSTER])	1067	else if (flag [FLAG_MONSTER])
…		…
1028	* the previous environment.	1078	* the previous environment.
1029	*/	1079	*/
1030	void	1080	void
1031	object::do_remove ()	1081	object::do_remove ()
1032	{	1082	{
1033	object *tmp, *last = 0;
1034	object *otmp;
1035
1036	if (flag [FLAG_REMOVED])	1083	if (flag [FLAG_REMOVED])
1037	return;	1084	return;
1038		1085
1039	INVOKE_OBJECT (REMOVE, this);	1086	INVOKE_OBJECT (REMOVE, this);
1040		1087
…		…
1052	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1099	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1053	if (object *pl = visible_to ())	1100	if (object *pl = visible_to ())
1054	esrv_del_item (pl->contr, count);	1101	esrv_del_item (pl->contr, count);
1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1102	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056		1103
1057	adjust_weight (env, -total_weight ());	1104	adjust_weight (env, total_weight (), 0);
1058		1105
1059	*(above ? &above->below : &env->inv) = below;	1106	object *pl = in_player ();
1060
1061	if (below)
1062	below->above = above;
1063		1107
1064	/* we set up values so that it could be inserted into	1108	/* we set up values so that it could be inserted into
1065	* the map, but we don't actually do that - it is up	1109	* the map, but we don't actually do that - it is up
1066	* to the caller to decide what we want to do.	1110	* to the caller to decide what we want to do.
1067	*/	1111	*/
1068	map = env->map;	1112	map = env->map;
1069	x = env->x;	1113	x = env->x;
1070	y = env->y;	1114	y = env->y;
		1115
		1116	// make sure cmov optimisation is applicable
		1117	*(above ? &above->below : &env->inv) = below;
		1118	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1119
1071	above = 0;	1120	above = 0;
1072	below = 0;	1121	below = 0;
1073	env = 0;	1122	env = 0;
1074		1123
1075	/* NO_FIX_PLAYER is set when a great many changes are being	1124	if (pl && pl->is_player ())
1076	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.
1078	*/	1125	{
1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1126	if (expect_false (pl->contr->combat_ob == this))
1080	otmp->update_stats ();	1127	{
		1128	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1129	pl->contr->combat_ob = 0;
		1130	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1131	}
		1132
		1133	if (expect_false (pl->contr->ranged_ob == this))
		1134	{
		1135	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1136	pl->contr->ranged_ob = 0;
		1137	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1138	}
		1139
		1140	pl->contr->queue_stats_update ();
		1141
		1142	if (expect_false (glow_radius) && pl->is_on_map ())
		1143	update_all_los (pl->map, pl->x, pl->y);
		1144	}
1081	}	1145	}
1082	else if (map)	1146	else if (map)
1083	{	1147	{
1084	map->dirty = true;	1148	map->dirty = true;
1085	mapspace &ms = this->ms ();	1149	mapspace &ms = this->ms ();
1086		1150
1087	if (object *pl = ms.player ())	1151	if (object *pl = ms.player ())
1088	{	1152	{
1089	if (type == PLAYER) // this == pl(!)	1153	if (is_player ())
1090	{	1154	{
		1155	if (!flag [FLAG_WIZPASS])
		1156	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1157
1091	// leaving a spot always closes any open container on the ground	1158	// leaving a spot always closes any open container on the ground
1092	if (container && !container->env)	1159	if (container && !container->env)
1093	// this causes spurious floorbox updates, but it ensures	1160	// this causes spurious floorbox updates, but it ensures
1094	// that the CLOSE event is being sent.	1161	// that the CLOSE event is being sent.
1095	close_container ();	1162	close_container ();
1096		1163
1097	--map->players;	1164	--map->players;
1098	map->touch ();	1165	map->touch ();
1099	}	1166	}
1100	else if (pl->container == this)	1167	else if (pl->container_ () == this)
1101	{	1168	{
1102	// removing a container should close it	1169	// removing a container should close it
1103	close_container ();	1170	close_container ();
1104	}	1171	}
1105		1172	else
1106	esrv_del_item (pl->contr, count);	1173	esrv_del_item (pl->contr, count);
1107	}	1174	}
1108		1175
1109	/* link the object above us */	1176	/* link the object above us */
1110	if (above)	1177	// re-link, make sure compiler can easily use cmove
1111	above->below = below;	1178	*(above ? &above->below : &ms.top) = below;
1112	else	1179	*(below ? &below->above : &ms.bot) = above;
1113	ms.top = below; /* we were top, set new top */
1114
1115	/* Relink the object below us, if there is one */
1116	if (below)
1117	below->above = above;
1118	else
1119	{
1120	/* Nothing below, which means we need to relink map object for this space
1121	* use translated coordinates in case some oddness with map tiling is
1122	* evident
1123	*/
1124	if (GET_MAP_OB (map, x, y) != this)
1125	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 ());
1126
1127	ms.bot = above; /* goes on above it. */
1128	}
1129		1180
1130	above = 0;	1181	above = 0;
1131	below = 0;	1182	below = 0;
1132		1183
1133	if (map->in_memory == MAP_SAVING)	1184	ms.invalidate ();
1134	return;
1135		1185
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1186	int check_walk_off = !flag [FLAG_NO_APPLY];
1137		1187
1138	if (object *pl = ms.player ())	1188	if (object *pl = ms.player ())
1139	{	1189	{
1140	if (pl->container == this)	1190	if (pl->container_ () == this)
1141	/* If a container that the player is currently using somehow gets	1191	/* If a container that the player is currently using somehow gets
1142	* removed (most likely destroyed), update the player view	1192	* removed (most likely destroyed), update the player view
1143	* appropriately.	1193	* appropriately.
1144	*/	1194	*/
1145	pl->close_container ();	1195	pl->close_container ();
…		…
1149	//TODO: update floorbox to preserve ordering	1199	//TODO: update floorbox to preserve ordering
1150	if (pl->contr->ns)	1200	if (pl->contr->ns)
1151	pl->contr->ns->floorbox_update ();	1201	pl->contr->ns->floorbox_update ();
1152	}	1202	}
1153		1203
		1204	if (check_walk_off)
1154	for (tmp = ms.bot; tmp; tmp = tmp->above)	1205	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1155	{	1206	{
		1207	above = tmp->above;
		1208
1156	/* No point updating the players look faces if he is the object	1209	/* No point updating the players look faces if he is the object
1157	* being removed.	1210	* being removed.
1158	*/	1211	*/
1159		1212
1160	/* See if object moving off should effect something */	1213	/* See if object moving off should effect something */
1161	if (check_walk_off
1162	&& ((move_type & tmp->move_off)	1214	if ((move_type & tmp->move_off)
1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1215	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164	{
1165	move_apply (tmp, this, 0);	1216	move_apply (tmp, this, 0);
1166
1167	if (destroyed ())
1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169	}	1217	}
1170		1218
1171	last = tmp;	1219	if (affects_los ())
1172	}
1173
1174	/* last == NULL if there are no objects on this space */
1175	//TODO: this makes little sense, why only update the topmost object?
1176	if (!last)
1177	map->at (x, y).flags_ = 0;
1178	else
1179	update_object (last, UP_OBJ_REMOVE);
1180
1181	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1182	update_all_los (map, x, y);	1220	update_all_los (map, x, y);
1183	}	1221	}
1184	}	1222	}
1185		1223
1186	/*	1224	/*
…		…
1210	esrv_update_item (UPD_NROF, pl, top);	1248	esrv_update_item (UPD_NROF, pl, top);
1211		1249
1212	op->weight = 0; // cancel the addition above	1250	op->weight = 0; // cancel the addition above
1213	op->carrying = 0; // must be 0 already	1251	op->carrying = 0; // must be 0 already
1214		1252
1215	op->destroy (1);	1253	op->destroy ();
1216		1254
1217	return top;	1255	return top;
1218	}	1256	}
1219		1257
1220	return 0;	1258	return 0;
…		…
1228		1266
1229	object *prev = this;	1267	object *prev = this;
1230		1268
1231	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1269	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1232	{	1270	{
1233	object *op = arch_to_object (at);	1271	object *op = at->instance ();
1234		1272
1235	op->name = name;	1273	op->name = name;
1236	op->name_pl = name_pl;	1274	op->name_pl = name_pl;
1237	op->title = title;	1275	op->title = title;
1238		1276
…		…
1248	* job preparing multi-part monsters.	1286	* job preparing multi-part monsters.
1249	*/	1287	*/
1250	object *	1288	object *
1251	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1289	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1252	{	1290	{
		1291	op->remove ();
		1292
1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1293	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254	{	1294	{
1255	tmp->x = x + tmp->arch->x;	1295	tmp->x = x + tmp->arch->x;
1256	tmp->y = y + tmp->arch->y;	1296	tmp->y = y + tmp->arch->y;
1257	}	1297	}
…		…
1274	* Passing 0 for flag gives proper default values, so flag really only needs	1314	* Passing 0 for flag gives proper default values, so flag really only needs
1275	* to be set if special handling is needed.	1315	* to be set if special handling is needed.
1276	*	1316	*
1277	* Return value:	1317	* Return value:
1278	* new object if 'op' was merged with other object	1318	* new object if 'op' was merged with other object
1279	* NULL if 'op' was destroyed	1319	* NULL if there was an error (destroyed, blocked etc.)
1280	* just 'op' otherwise	1320	* just 'op' otherwise
1281	*/	1321	*/
1282	object *	1322	object *
1283	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1323	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1284	{	1324	{
1285	assert (!op->flag [FLAG_FREED]);
1286
1287	op->remove ();	1325	op->remove ();
		1326
		1327	if (m == &freed_map)//D TODO: remove soon
		1328	{//D
		1329	LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
		1330	}//D
1288		1331
1289	/* Ideally, the caller figures this out. However, it complicates a lot	1332	/* Ideally, the caller figures this out. However, it complicates a lot
1290	* of areas of callers (eg, anything that uses find_free_spot would now	1333	* of areas of callers (eg, anything that uses find_free_spot would now
1291	* need extra work	1334	* need extra work
1292	*/	1335	*/
		1336	maptile *newmap = m;
1293	if (!xy_normalise (m, op->x, op->y))	1337	if (!xy_normalise (newmap, op->x, op->y))
1294	{	1338	{
1295	op->destroy (1);	1339	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1296	return 0;	1340	return 0;
1297	}	1341	}
1298		1342
1299	if (object *more = op->more)	1343	if (object *more = op->more)
1300	if (!insert_ob_in_map (more, m, originator, flag))	1344	if (!insert_ob_in_map (more, m, originator, flag))
1301	return 0;	1345	return 0;
1302		1346
1303	CLEAR_FLAG (op, FLAG_REMOVED);	1347	op->flag [FLAG_REMOVED] = false;
1304		1348	op->env = 0;
1305	op->map = m;	1349	op->map = newmap;
		1350
1306	mapspace &ms = op->ms ();	1351	mapspace &ms = op->ms ();
1307		1352
1308	/* this has to be done after we translate the coordinates.	1353	/* this has to be done after we translate the coordinates.
1309	*/	1354	*/
1310	if (op->nrof && !(flag & INS_NO_MERGE))	1355	if (op->nrof && !(flag & INS_NO_MERGE))
1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1356	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312	if (object::can_merge (op, tmp))	1357	if (object::can_merge (op, tmp))
1313	{	1358	{
1314	// TODO: we atcually want to update tmp, not op,	1359	// TODO: we actually want to update tmp, not op,
1315	// but some caller surely breaks when we return tmp	1360	// but some caller surely breaks when we return tmp
1316	// from here :/	1361	// from here :/
1317	op->nrof += tmp->nrof;	1362	op->nrof += tmp->nrof;
1318	tmp->destroy (1);	1363	tmp->destroy ();
1319	}	1364	}
1320		1365
1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1366	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1367	op->clr_flag (FLAG_INV_LOCKED);
1323		1368
1324	if (!QUERY_FLAG (op, FLAG_ALIVE))	1369	if (!op->flag [FLAG_ALIVE])
1325	CLEAR_FLAG (op, FLAG_NO_STEAL);	1370	op->clr_flag (FLAG_NO_STEAL);
1326		1371
1327	if (flag & INS_BELOW_ORIGINATOR)	1372	if (flag & INS_BELOW_ORIGINATOR)
1328	{	1373	{
1329	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1374	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1330	{	1375	{
1331	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1376	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1332	abort ();	1377	abort ();
1333	}	1378	}
1334		1379
		1380	if (!originator->is_on_map ())
		1381	{
		1382	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1383	op->debug_desc (), originator->debug_desc ());
		1384	abort ();
		1385	}
		1386
1335	op->above = originator;	1387	op->above = originator;
1336	op->below = originator->below;	1388	op->below = originator->below;
1337
1338	if (op->below)
1339	op->below->above = op;
1340	else
1341	ms.bot = op;
1342
1343	/* since *below* originator, no need to update top */
1344	originator->below = op;	1389	originator->below = op;
		1390
		1391	*(op->below ? &op->below->above : &ms.bot) = op;
1345	}	1392	}
1346	else	1393	else
1347	{	1394	{
1348	object *top, *floor = NULL;	1395	object *floor = 0;
1349		1396	object *top = ms.top;
1350	top = ms.bot;
1351		1397
1352	/* If there are other objects, then */	1398	/* If there are other objects, then */
1353	if (top)	1399	if (top)
1354	{	1400	{
1355	object *last = 0;
1356
1357	/*	1401	/*
1358	* If there are multiple objects on this space, we do some trickier handling.	1402	* If there are multiple objects on this space, we do some trickier handling.
1359	* We've already dealt with merging if appropriate.	1403	* We've already dealt with merging if appropriate.
1360	* Generally, we want to put the new object on top. But if	1404	* Generally, we want to put the new object on top. But if
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1405	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1364	* once we get to them. This reduces the need to traverse over all of	1408	* once we get to them. This reduces the need to traverse over all of
1365	* them when adding another one - this saves quite a bit of cpu time	1409	* them when adding another one - this saves quite a bit of cpu time
1366	* when lots of spells are cast in one area. Currently, it is presumed	1410	* when lots of spells are cast in one area. Currently, it is presumed
1367	* that flying non pickable objects are spell objects.	1411	* that flying non pickable objects are spell objects.
1368	*/	1412	*/
1369	for (top = ms.bot; top; top = top->above)	1413	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1414	{
1371	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1415	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1372	floor = top;	1416	floor = tmp;
1373		1417
1374	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1418	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1375	{	1419	{
1376	/* We insert above top, so we want this object below this */	1420	/* We insert above top, so we want this object below this */
1377	top = top->below;	1421	top = tmp->below;
1378	break;	1422	break;
1379	}	1423	}
1380		1424
1381	last = top;	1425	top = tmp;
1382	}	1426	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1427
1387	/* We let update_position deal with figuring out what the space	1428	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1429	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1430	* makes things faster, and effectively the same result.
1390	*/	1431	*/
…		…
1397	*/	1438	*/
1398	if (!(flag & INS_ON_TOP)	1439	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1440	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1441	&& (op->face && !faces [op->face].visibility))
1401	{	1442	{
		1443	object *last;
		1444
1402	for (last = top; last != floor; last = last->below)	1445	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1446	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1404	break;	1447	break;
1405		1448
1406	/* Check to see if we found the object that blocks view,	1449	/* Check to see if we found the object that blocks view,
1407	* and make sure we have a below pointer for it so that	1450	* and make sure we have a below pointer for it so that
1408	* we can get inserted below this one, which requires we	1451	* we can get inserted below this one, which requires we
…		…
1414	} /* If objects on this space */	1457	} /* If objects on this space */
1415		1458
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1459	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1460	top = floor;
1418		1461
1419	/* Top is the object that our object (op) is going to get inserted above.	1462	// insert object above top, or bottom-most if top = 0
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1463	if (!top)
1424	{	1464	{
		1465	op->below = 0;
1425	op->above = ms.bot;	1466	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1467	ms.bot = op;
		1468
		1469	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1470	}
1433	else	1471	else
1434	{ /* get inserted into the stack above top */	1472	{
1435	op->above = top->above;	1473	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1474	top->above = op;
1439		1475
1440	op->below = top;	1476	op->below = top;
1441	top->above = op;	1477	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1478	}
		1479	}
1443		1480
1444	if (!op->above)	1481	if (op->is_player ())
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447
1448	if (op->type == PLAYER)
1449	{	1482	{
1450	op->contr->do_los = 1;	1483	op->contr->do_los = 1;
1451	++op->map->players;	1484	++op->map->players;
1452	op->map->touch ();	1485	op->map->touch ();
1453	}	1486	}
…		…
1468	* be far away from this change and not affected in any way -	1501	* be far away from this change and not affected in any way -
1469	* this should get redone to only look for players within range,	1502	* this should get redone to only look for players within range,
1470	* or just updating the P_UPTODATE for spaces within this area	1503	* or just updating the P_UPTODATE for spaces within this area
1471	* of effect may be sufficient.	1504	* of effect may be sufficient.
1472	*/	1505	*/
1473	if (op->map->darkness && (op->glow_radius != 0))	1506	if (op->affects_los ())
		1507	{
		1508	op->ms ().invalidate ();
1474	update_all_los (op->map, op->x, op->y);	1509	update_all_los (op->map, op->x, op->y);
		1510	}
1475		1511
1476	/* updates flags (blocked, alive, no magic, etc) for this map space */	1512	/* updates flags (blocked, alive, no magic, etc) for this map space */
1477	update_object (op, UP_OBJ_INSERT);	1513	update_object (op, UP_OBJ_INSERT);
1478		1514
1479	INVOKE_OBJECT (INSERT, op);	1515	INVOKE_OBJECT (INSERT, op);
…		…
1486	* blocked() and wall() work properly), and these flags are updated by	1522	* blocked() and wall() work properly), and these flags are updated by
1487	* update_object().	1523	* update_object().
1488	*/	1524	*/
1489		1525
1490	/* if this is not the head or flag has been passed, don't check walk on status */	1526	/* if this is not the head or flag has been passed, don't check walk on status */
1491	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1492	{	1528	{
1493	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator, flag))
1494	return 0;	1530	return 0;
1495		1531
1496	/* If we are a multi part object, lets work our way through the check	1532	/* If we are a multi part object, let's work our way through the check
1497	* walk on's.	1533	* walk on's.
1498	*/	1534	*/
1499	for (object *tmp = op->more; tmp; tmp = tmp->more)	1535	for (object *tmp = op->more; tmp; tmp = tmp->more)
1500	if (check_move_on (tmp, originator))	1536	if (check_move_on (tmp, originator, flag))
1501	return 0;	1537	return 0;
1502	}	1538	}
1503		1539
1504	return op;	1540	return op;
1505	}	1541	}
…		…
1507	/* this function inserts an object in the map, but if it	1543	/* this function inserts an object in the map, but if it
1508	* finds an object of its own type, it'll remove that one first.	1544	* finds an object of its own type, it'll remove that one first.
1509	* op is the object to insert it under: supplies x and the map.	1545	* op is the object to insert it under: supplies x and the map.
1510	*/	1546	*/
1511	void	1547	void
1512	replace_insert_ob_in_map (const char *arch_string, object *op)	1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1513	{	1549	{
1514	/* first search for itself and remove any old instances */	1550	/* first search for itself and remove any old instances */
1515		1551
1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1552	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1553	if (tmp->arch->archname == archname) /* same archetype */
1518	tmp->destroy (1);	1554	tmp->destroy ();
1519		1555
1520	object *tmp = arch_to_object (archetype::find (arch_string));	1556	object *tmp = archetype::find (archname)->instance ();
1521		1557
1522	tmp->x = op->x;	1558	tmp->x = op->x;
1523	tmp->y = op->y;	1559	tmp->y = op->y;
1524		1560
1525	insert_ob_in_map (tmp, op->map, op, 0);	1561	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1530	{	1566	{
1531	if (where->env)	1567	if (where->env)
1532	return where->env->insert (this);	1568	return where->env->insert (this);
1533	else	1569	else
1534	return where->map->insert (this, where->x, where->y, originator, flags);	1570	return where->map->insert (this, where->x, where->y, originator, flags);
		1571	}
		1572
		1573	// check whether we can put this into the map, respect max_volume, max_items
		1574	bool
		1575	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1576	{
		1577	mapspace &ms = m->at (x, y);
		1578
		1579	int items = ms.items ();
		1580
		1581	if (!items // testing !items ensures we can drop at least one item
		1582	|| (items < m->max_items
		1583	&& ms.volume () < m->max_volume))
		1584	return true;
		1585
		1586	if (originator)
		1587	originator->failmsgf (
		1588	"No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
		1589	query_name ()
		1590	);
		1591
		1592	return false;
1535	}	1593	}
1536		1594
1537	/*	1595	/*
1538	* decrease(object, number) decreases a specified number from	1596	* decrease(object, number) decreases a specified number from
1539	* the amount of an object. If the amount reaches 0, the object	1597	* the amount of an object. If the amount reaches 0, the object
…		…
1547	if (!nr)	1605	if (!nr)
1548	return true;	1606	return true;
1549		1607
1550	nr = min (nr, nrof);	1608	nr = min (nr, nrof);
1551		1609
		1610	if (nrof > nr)
		1611	{
		1612	weight_t oweight = total_weight ();
		1613
1552	nrof -= nr;	1614	nrof -= nr;
1553
1554	if (nrof)
1555	{
1556	adjust_weight (env, -weight * nr); // carrying == 0
1557		1615
1558	if (object *pl = visible_to ())	1616	if (object *pl = visible_to ())
1559	esrv_update_item (UPD_NROF, pl, this);	1617	esrv_update_item (UPD_NROF, pl, this);
1560		1618
		1619	adjust_weight (env, oweight, total_weight ());
		1620
1561	return true;	1621	return true;
1562	}	1622	}
1563	else	1623	else
1564	{	1624	{
1565	destroy (1);	1625	destroy ();
1566	return false;	1626	return false;
1567	}	1627	}
1568	}	1628	}
1569		1629
1570	/*	1630	/*
…		…
1587	}	1647	}
1588	else	1648	else
1589	{	1649	{
1590	decrease (nr);	1650	decrease (nr);
1591		1651
1592	object *op = object_create_clone (this);	1652	object *op = deep_clone ();
1593	op->nrof = nr;	1653	op->nrof = nr;
1594	return op;	1654	return op;
1595	}	1655	}
1596	}	1656	}
1597		1657
…		…
1639	if (op->nrof)	1699	if (op->nrof)
1640	for (object *tmp = inv; tmp; tmp = tmp->below)	1700	for (object *tmp = inv; tmp; tmp = tmp->below)
1641	if (object::can_merge (tmp, op))	1701	if (object::can_merge (tmp, op))
1642	{	1702	{
1643	/* return the original object and remove inserted object	1703	/* return the original object and remove inserted object
1644	(client needs the original object) */	1704	(client prefers the original object) */
		1705
		1706	// carrying must be 0 for mergable objects
		1707	weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
		1708
1645	tmp->nrof += op->nrof;	1709	tmp->nrof += op->nrof;
1646		1710
1647	if (object *pl = tmp->visible_to ())	1711	if (object *pl = tmp->visible_to ())
1648	esrv_update_item (UPD_NROF, pl, tmp);	1712	esrv_update_item (UPD_NROF, pl, tmp);
1649		1713
1650	adjust_weight (this, op->total_weight ());	1714	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1651		1715
1652	op->destroy (1);	1716	op->destroy ();
1653	op = tmp;	1717	op = tmp;
1654	goto inserted;	1718	goto inserted;
1655	}	1719	}
1656		1720
1657	op->owner = 0; // it's his/hers now. period.	1721	op->owner = 0; // it's his/hers now. period.
…		…
1671	op->flag [FLAG_REMOVED] = 0;	1735	op->flag [FLAG_REMOVED] = 0;
1672		1736
1673	if (object *pl = op->visible_to ())	1737	if (object *pl = op->visible_to ())
1674	esrv_send_item (pl, op);	1738	esrv_send_item (pl, op);
1675		1739
1676	adjust_weight (this, op->total_weight ());	1740	adjust_weight (this, 0, op->total_weight ());
1677		1741
1678	inserted:	1742	inserted:
1679	/* reset the light list and los of the players on the map */	1743	/* reset the light list and los of the players on the map */
1680	if (op->glow_radius && map && map->darkness)	1744	if (op->glow_radius && is_on_map ())
		1745	{
		1746	update_stats ();
1681	update_all_los (map, x, y);	1747	update_all_los (map, x, y);
1682		1748	}
		1749	else if (is_player ())
1683	// if this is a player's inventory, update stats	1750	// if this is a player's inventory, update stats
1684	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1751	contr->queue_stats_update ();
1685	update_stats ();
1686		1752
1687	INVOKE_OBJECT (INSERT, this);	1753	INVOKE_OBJECT (INSERT, this);
1688		1754
1689	return op;	1755	return op;
1690	}	1756	}
…		…
1708	* MSW 2001-07-08: Check all objects on space, not just those below	1774	* MSW 2001-07-08: Check all objects on space, not just those below
1709	* object being inserted. insert_ob_in_map may not put new objects	1775	* object being inserted. insert_ob_in_map may not put new objects
1710	* on top.	1776	* on top.
1711	*/	1777	*/
1712	int	1778	int
1713	check_move_on (object *op, object *originator)	1779	check_move_on (object *op, object *originator, int flags)
1714	{	1780	{
		1781	if (op->flag [FLAG_NO_APPLY])
		1782	return 0;
		1783
1715	object *tmp;	1784	object *tmp;
1716	maptile *m = op->map;	1785	maptile *m = op->map;
1717	int x = op->x, y = op->y;	1786	int x = op->x, y = op->y;
1718		1787
1719	MoveType move_on, move_slow, move_block;	1788	mapspace &ms = m->at (x, y);
1720		1789
1721	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1790	ms.update ();
1722	return 0;
1723		1791
1724	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1792	MoveType move_on = ms.move_on;
1725	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1793	MoveType move_slow = ms.move_slow;
1726	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1794	MoveType move_block = ms.move_block;
1727		1795
1728	/* if nothing on this space will slow op down or be applied,	1796	/* if nothing on this space will slow op down or be applied,
1729	* no need to do checking below. have to make sure move_type	1797	* no need to do checking below. have to make sure move_type
1730	* is set, as lots of objects don't have it set - we treat that	1798	* is set, as lots of objects don't have it set - we treat that
1731	* as walking.	1799	* as walking.
…		…
1742	return 0;	1810	return 0;
1743		1811
1744	/* The objects have to be checked from top to bottom.	1812	/* The objects have to be checked from top to bottom.
1745	* Hence, we first go to the top:	1813	* Hence, we first go to the top:
1746	*/	1814	*/
1747		1815	for (object *next, *tmp = ms.top; tmp; tmp = next)
1748	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1749	{
1750	/* Trim the search when we find the first other spell effect
1751	* this helps performance so that if a space has 50 spell objects,
1752	* we don't need to check all of them.
1753	*/
1754	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1755	break;
1756	}	1816	{
		1817	next = tmp->below;
1757		1818
1758	for (; tmp; tmp = tmp->below)
1759	{
1760	if (tmp == op)	1819	if (tmp == op)
1761	continue; /* Can't apply yourself */	1820	continue; /* Can't apply yourself */
1762		1821
1763	/* Check to see if one of the movement types should be slowed down.	1822	/* Check to see if one of the movement types should be slowed down.
1764	* Second check makes sure that the movement types not being slowed	1823	* Second check makes sure that the movement types not being slowed
1765	* (~slow_move) is not blocked on this space - just because the	1824	* (~slow_move) is not blocked on this space - just because the
1766	* space doesn't slow down swimming (for example), if you can't actually	1825	* space doesn't slow down swimming (for example), if you can't actually
1767	* swim on that space, can't use it to avoid the penalty.	1826	* swim on that space, can't use it to avoid the penalty.
1768	*/	1827	*/
1769	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1828	if (!op->flag [FLAG_WIZPASS])
1770	{	1829	{
1771	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1830	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1772	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1831	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773	{	1832	{
1774
1775	float
1776	diff = tmp->move_slow_penalty * fabs (op->speed);	1833	float diff = tmp->move_slow_penalty * fabs (op->speed);
1777		1834
1778	if (op->type == PLAYER)	1835	if (op->is_player ())
1779	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1836	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1780	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1837	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1781	diff /= 4.0;	1838	diff /= 4.0;
1782		1839
1783	op->speed_left -= diff;	1840	op->speed_left -= diff;
1784	}	1841	}
1785	}	1842	}
1786		1843
1787	/* Basically same logic as above, except now for actual apply. */	1844	/* Basically same logic as above, except now for actual apply. */
1788	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1845	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1789	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1846	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1790	{	1847	{
		1848	if ((flags & INS_NO_AUTO_EXIT)
		1849	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1850	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1851	continue;
		1852
1791	move_apply (tmp, op, originator);	1853	move_apply (tmp, op, originator);
1792		1854
1793	if (op->destroyed ())	1855	if (op->destroyed ())
1794	return 1;	1856	return 1;
1795		1857
…		…
1818	LOG (llevError, "Present_arch called outside map.\n");	1880	LOG (llevError, "Present_arch called outside map.\n");
1819	return NULL;	1881	return NULL;
1820	}	1882	}
1821		1883
1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1884	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1823	if (tmp->arch == at)	1885	if (tmp->arch->archname == at->archname)
1824	return tmp;	1886	return tmp;
1825		1887
1826	return NULL;	1888	return NULL;
1827	}	1889	}
1828		1890
…		…
1892	* The first matching object is returned, or NULL if none.	1954	* The first matching object is returned, or NULL if none.
1893	*/	1955	*/
1894	object *	1956	object *
1895	present_arch_in_ob (const archetype *at, const object *op)	1957	present_arch_in_ob (const archetype *at, const object *op)
1896	{	1958	{
1897	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1959	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1898	if (tmp->arch == at)	1960	if (tmp->arch->archname == at->archname)
1899	return tmp;	1961	return tmp;
1900		1962
1901	return NULL;	1963	return NULL;
1902	}	1964	}
1903		1965
…		…
1907	void	1969	void
1908	flag_inv (object *op, int flag)	1970	flag_inv (object *op, int flag)
1909	{	1971	{
1910	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1911	{	1973	{
1912	SET_FLAG (tmp, flag);	1974	tmp->set_flag (flag);
1913	flag_inv (tmp, flag);	1975	flag_inv (tmp, flag);
1914	}	1976	}
1915	}	1977	}
1916		1978
1917	/*	1979	/*
…		…
1920	void	1982	void
1921	unflag_inv (object *op, int flag)	1983	unflag_inv (object *op, int flag)
1922	{	1984	{
1923	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1985	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1924	{	1986	{
1925	CLEAR_FLAG (tmp, flag);	1987	tmp->clr_flag (flag);
1926	unflag_inv (tmp, flag);	1988	unflag_inv (tmp, flag);
1927	}	1989	}
1928	}	1990	}
1929		1991
1930	/*	1992	/*
…		…
1947	*/	2009	*/
1948	int	2010	int
1949	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2011	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1950	{	2012	{
1951	int altern[SIZEOFFREE];	2013	int altern[SIZEOFFREE];
1952	int index = 0, flag;	2014	int index = 0;
1953		2015
1954	for (int i = start; i < stop; i++)	2016	for (int i = start; i < stop; i++)
1955	{	2017	{
1956	mapxy pos (m, x, y); pos.move (i);	2018	mapxy pos (m, x, y); pos.move (i);
1957		2019
…		…
1991	* head of the object should correspond for the entire object.	2053	* head of the object should correspond for the entire object.
1992	*/	2054	*/
1993	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2055	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1994	continue;	2056	continue;
1995		2057
1996	if (ob->blocked (m, pos.x, pos.y))	2058	if (ob->blocked (pos.m, pos.x, pos.y))
1997	continue;	2059	continue;
1998		2060
1999	altern [index++] = i;	2061	altern [index++] = i;
2000	}	2062	}
2001		2063
…		…
2069	* there is capable of.	2131	* there is capable of.
2070	*/	2132	*/
2071	int	2133	int
2072	find_dir (maptile *m, int x, int y, object *exclude)	2134	find_dir (maptile *m, int x, int y, object *exclude)
2073	{	2135	{
2074	int i, max = SIZEOFFREE, mflags;	2136	int max = SIZEOFFREE;
2075
2076	sint16 nx, ny;
2077	object *tmp;
2078	maptile *mp;
2079
2080	MoveType blocked, move_type;	2137	MoveType move_type;
2081		2138
2082	if (exclude && exclude->head_ () != exclude)	2139	if (exclude && exclude->head_ () != exclude)
2083	{	2140	{
2084	exclude = exclude->head;	2141	exclude = exclude->head;
2085	move_type = exclude->move_type;	2142	move_type = exclude->move_type;
…		…
2088	{	2145	{
2089	/* If we don't have anything, presume it can use all movement types. */	2146	/* If we don't have anything, presume it can use all movement types. */
2090	move_type = MOVE_ALL;	2147	move_type = MOVE_ALL;
2091	}	2148	}
2092		2149
2093	for (i = 1; i < max; i++)	2150	for (int i = 1; i < max; i++)
2094	{	2151	{
2095	mp = m;	2152	mapxy pos (m, x, y);
2096	nx = x + freearr_x[i];	2153	pos.move (i);
2097	ny = y + freearr_y[i];
2098		2154
2099	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2155	if (!pos.normalise ())
2100
2101	if (mflags & P_OUT_OF_MAP)
2102	max = maxfree[i];	2156	max = maxfree[i];
2103	else	2157	else
2104	{	2158	{
2105	mapspace &ms = mp->at (nx, ny);	2159	mapspace &ms = *pos;
2106		2160
2107	blocked = ms.move_block;
2108
2109	if ((move_type & blocked) == move_type)	2161	if ((move_type & ms.move_block) == move_type)
2110	max = maxfree[i];	2162	max = maxfree [i];
2111	else if (mflags & P_IS_ALIVE)	2163	else if (ms.flags () & P_IS_ALIVE)
2112	{	2164	{
2113	for (tmp = ms.bot; tmp; tmp = tmp->above)	2165	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2114	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2166	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2115	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2167	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2116	break;
2117
2118	if (tmp)
2119	return freedir[i];	2168	return freedir [i];
2120	}	2169	}
2121	}	2170	}
2122	}	2171	}
2123		2172
2124	return 0;	2173	return 0;
…		…
2133	{	2182	{
2134	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2183	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2135	}	2184	}
2136		2185
2137	/*	2186	/*
2138	* find_dir_2(delta-x,delta-y) will return a direction in which	2187	* find_dir_2(delta-x,delta-y) will return a direction value
2139	* an object which has subtracted the x and y coordinates of another	2188	* for running into direct [dx, dy].
2140	* object, needs to travel toward it.	2189	* (the opposite of crossfire's find_dir_2!)
2141	*/	2190	*/
2142	int	2191	int
2143	find_dir_2 (int x, int y)	2192	find_dir_2 (int x, int y)
2144	{	2193	{
		2194	#if 1 // new algorithm
		2195	// this works by putting x, y into 16 sectors, which
		2196	// are not equal sized, but are a better approximation
		2197	// then the old algorithm, and then using a mapping
		2198	// table to map it into a direction value.
		2199	// basically, it maps these comparisons to each bit
		2200	// bit #3: x < 0
		2201	// bit #2: y < 0
		2202	// bit #1: x > y
		2203	// bit #0: x > 2y
		2204
		2205	static const uint8 dir[16] = {
		2206	4, 5, 4, 3,
		2207	2, 1, 2, 3,
		2208	6, 5, 6, 7,
		2209	8, 1, 8, 7,
		2210	};
		2211	int sector = 0;
		2212
		2213	// this is a bit ugly, but more likely to result in branchless code
		2214	sector |= x < 0 ? 8 : 0;
		2215	x = x < 0 ? -x : x; // abs
		2216
		2217	sector |= y < 0 ? 4 : 0;
		2218	y = y < 0 ? -y : y; // abs
		2219
		2220	if (x > y)
		2221	{
		2222	sector |= 2;
		2223
		2224	if (x > y * 2)
		2225	sector |= 1;
		2226	}
		2227	else
		2228	{
		2229	if (y > x * 2)
		2230	sector |= 1;
		2231	else if (!y)
		2232	return 0; // x == 0 here
		2233	}
		2234
		2235	return dir [sector];
		2236	#else // old algorithm
2145	int q;	2237	int q;
2146		2238
2147	if (y)	2239	if (y)
2148	q = x * 100 / y;	2240	q = 128 * x / y;
2149	else if (x)	2241	else if (x)
2150	q = -300 * x;	2242	q = -512 * x; // to make it > 309
2151	else	2243	else
2152	return 0;	2244	return 0;
2153		2245
2154	if (y > 0)	2246	if (y > 0)
2155	{	2247	{
2156	if (q < -242)	2248	if (q < -309) return 7;
		2249	if (q < -52) return 6;
		2250	if (q < 52) return 5;
		2251	if (q < 309) return 4;
		2252
2157	return 3;	2253	return 3;
2158	if (q < -41)	2254	}
2159	return 2;	2255	else
2160	if (q < 41)	2256	{
2161	return 1;	2257	if (q < -309) return 3;
2162	if (q < 242)	2258	if (q < -52) return 2;
2163	return 8;	2259	if (q < 52) return 1;
		2260	if (q < 309) return 8;
		2261
2164	return 7;	2262	return 7;
2165	}	2263	}
2166		2264	#endif
2167	if (q < -242)
2168	return 7;
2169	if (q < -41)
2170	return 6;
2171	if (q < 41)
2172	return 5;
2173	if (q < 242)
2174	return 4;
2175
2176	return 3;
2177	}	2265	}
2178		2266
2179	/*	2267	/*
2180	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2268	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2181	* between two directions (which are expected to be absolute (see absdir())	2269	* between two directions (which are expected to be absolute (see absdir())
2182	*/	2270	*/
2183	int	2271	int
2184	dirdiff (int dir1, int dir2)	2272	dirdiff (int dir1, int dir2)
2185	{	2273	{
2186	int d;
2187
2188	d = abs (dir1 - dir2);	2274	int d = abs (dir1 - dir2);
2189	if (d > 4)
2190	d = 8 - d;
2191		2275
2192	return d;	2276	return d > 4 ? 8 - d : d;
2193	}	2277	}
2194		2278
2195	/* peterm:	2279	/* peterm:
2196	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2280	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2197	* Basically, this is a table of directions, and what directions	2281	* Basically, this is a table of directions, and what directions
…		…
2199	* This basically means that if direction is 15, then it could either go	2283	* This basically means that if direction is 15, then it could either go
2200	* direction 4, 14, or 16 to get back to where we are.	2284	* direction 4, 14, or 16 to get back to where we are.
2201	* Moved from spell_util.c to object.c with the other related direction	2285	* Moved from spell_util.c to object.c with the other related direction
2202	* functions.	2286	* functions.
2203	*/	2287	*/
2204	int reduction_dir[SIZEOFFREE][3] = {	2288	static const int reduction_dir[SIZEOFFREE][3] = {
2205	{0, 0, 0}, /* 0 */	2289	{0, 0, 0}, /* 0 */
2206	{0, 0, 0}, /* 1 */	2290	{0, 0, 0}, /* 1 */
2207	{0, 0, 0}, /* 2 */	2291	{0, 0, 0}, /* 2 */
2208	{0, 0, 0}, /* 3 */	2292	{0, 0, 0}, /* 3 */
2209	{0, 0, 0}, /* 4 */	2293	{0, 0, 0}, /* 4 */
…		…
2303	* Add a check so we can't pick up invisible objects (0.93.8)	2387	* Add a check so we can't pick up invisible objects (0.93.8)
2304	*/	2388	*/
2305	int	2389	int
2306	can_pick (const object *who, const object *item)	2390	can_pick (const object *who, const object *item)
2307	{	2391	{
2308	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2392	return /*who->flag [FLAG_WIZ]|| */
2309	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2393	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2310	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2394	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2311	}	2395	}
		2396
		2397	//-GPL
2312		2398
2313	/*	2399	/*
2314	* create clone from object to another	2400	* create clone from object to another
2315	*/	2401	*/
2316	object *	2402	object *
2317	object_create_clone (object *asrc)	2403	object::deep_clone ()
2318	{	2404	{
		2405	assert (("deep_clone called on non-head object", is_head ()));
		2406
2319	object *dst = 0;	2407	object *dst = clone ();
2320		2408
2321	if (!asrc)
2322	return 0;
2323
2324	object *src = asrc->head_ ();
2325
2326	object *prev = 0;	2409	object *prev = dst;
2327	for (object *part = src; part; part = part->more)	2410	for (object *part = this->more; part; part = part->more)
2328	{	2411	{
2329	object *tmp = part->clone ();	2412	object *tmp = part->clone ();
2330
2331	tmp->x -= src->x;
2332	tmp->y -= src->y;
2333
2334	if (!part->head)
2335	{
2336	dst = tmp;
2337	tmp->head = 0;
2338	}
2339	else
2340	tmp->head = dst;	2413	tmp->head = dst;
2341
2342	tmp->more = 0;
2343
2344	if (prev)
2345	prev->more = tmp;	2414	prev->more = tmp;
2346
2347	prev = tmp;	2415	prev = tmp;
2348	}	2416	}
2349		2417
2350	for (object *item = src->inv; item; item = item->below)	2418	for (object *item = inv; item; item = item->below)
2351	insert_ob_in_ob (object_create_clone (item), dst);	2419	insert_ob_in_ob (item->deep_clone (), dst);
2352		2420
2353	return dst;	2421	return dst;
2354	}	2422	}
2355		2423
2356	/* This returns the first object in who's inventory that	2424	/* This returns the first object in who's inventory that
…		…
2365	return tmp;	2433	return tmp;
2366		2434
2367	return 0;	2435	return 0;
2368	}	2436	}
2369		2437
2370	const shstr &	2438	/* Zero the key_values on op, decrementing the shared-string
2371	object::kv_get (const shstr &key) const	2439	* refcounts and freeing the links.
		2440	*/
		2441	void
		2442	key_values::clear ()
2372	{	2443	{
		2444	for (key_value *kvp = first; kvp; )
		2445	{
		2446	key_value *next = kvp->next;
		2447	delete kvp;
		2448	kvp = next;
		2449	}
		2450
		2451	first = 0;
		2452	}
		2453
		2454	shstr_tmp
		2455	key_values::get (shstr_tmp key) const
		2456	{
2373	for (key_value *kv = key_values; kv; kv = kv->next)	2457	for (key_value *kv = first; kv; kv = kv->next)
2374	if (kv->key == key)	2458	if (kv->key == key)
2375	return kv->value;	2459	return kv->value;
2376		2460
2377	return shstr_null;	2461	return shstr ();
2378	}	2462	}
2379		2463
2380	void	2464	void
2381	object::kv_set (const shstr &key, const shstr &value)	2465	key_values::add (shstr_tmp key, shstr_tmp value)
2382	{	2466	{
		2467	key_value *kv = new key_value;
		2468
		2469	kv->next = first;
		2470	kv->key = key;
		2471	kv->value = value;
		2472
		2473	first = kv;
		2474	}
		2475
		2476	void
		2477	key_values::set (shstr_tmp key, shstr_tmp value)
		2478	{
2383	for (key_value *kv = key_values; kv; kv = kv->next)	2479	for (key_value *kv = first; kv; kv = kv->next)
2384	if (kv->key == key)	2480	if (kv->key == key)
2385	{	2481	{
2386	kv->value = value;	2482	kv->value = value;
2387	return;	2483	return;
2388	}	2484	}
2389		2485
2390	key_value *kv = new key_value;	2486	add (key, value);
2391
2392	kv->next = key_values;
2393	kv->key = key;
2394	kv->value = value;
2395
2396	key_values = kv;
2397	}	2487	}
2398		2488
2399	void	2489	void
2400	object::kv_del (const shstr &key)	2490	key_values::del (shstr_tmp key)
2401	{	2491	{
2402	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2492	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2403	if ((*kvp)->key == key)	2493	if ((*kvp)->key == key)
2404	{	2494	{
2405	key_value *kv = *kvp;	2495	key_value *kv = *kvp;
2406	*kvp = (*kvp)->next;	2496	*kvp = (*kvp)->next;
2407	delete kv;	2497	delete kv;
2408	return;	2498	return;
2409	}	2499	}
2410	}	2500	}
2411		2501
		2502	void
		2503	key_values::reverse ()
		2504	{
		2505	key_value *prev = 0;
		2506	key_value *head = first;
		2507
		2508	while (head)
		2509	{
		2510	key_value *node = head;
		2511	head = head->next;
		2512	node->next = prev;
		2513	prev = node;
		2514	}
		2515
		2516	first = prev;
		2517	}
		2518
		2519	key_values &
		2520	key_values::operator =(const key_values &kv)
		2521	{
		2522	clear ();
		2523
		2524	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2525	add (kvp->key, kvp->value);
		2526
		2527	reverse ();
		2528	}
		2529
2412	object::depth_iterator::depth_iterator (object *container)	2530	object::depth_iterator::depth_iterator (object *container)
2413	: iterator_base (container)	2531	: iterator_base (container)
2414	{	2532	{
2415	while (item->inv)	2533	while (item->inv)
2416	item = item->inv;	2534	item = item->inv;
…		…
2464	{	2582	{
2465	char flagdesc[512];	2583	char flagdesc[512];
2466	char info2[256 * 4];	2584	char info2[256 * 4];
2467	char *p = info;	2585	char *p = info;
2468		2586
2469	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2587	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2470	count,	2588	count,
2471	uuid.c_str (),	2589	uuid.c_str (),
2472	&name,	2590	&name,
2473	title ? "\",title:\"" : "",	2591	title ? ",title:\"" : "",
2474	title ? (const char *)title : "",	2592	title ? (const char *)title : "",
		2593	title ? "\"" : "",
2475	flag_desc (flagdesc, 512), type);	2594	flag_desc (flagdesc, 512), type);
2476		2595
2477	if (!flag[FLAG_REMOVED] && env)	2596	if (!flag[FLAG_REMOVED] && env)
2478	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2597	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2479		2598
…		…
2497	{	2616	{
2498	return map ? map->region (x, y)	2617	return map ? map->region (x, y)
2499	: region::default_region ();	2618	: region::default_region ();
2500	}	2619	}
2501		2620
2502	const materialtype_t *	2621	//+GPL
2503	object::dominant_material () const
2504	{
2505	if (materialtype_t *mt = name_to_material (materialname))
2506	return mt;
2507
2508	return name_to_material (shstr_unknown);
2509	}
2510		2622
2511	void	2623	void
2512	object::open_container (object *new_container)	2624	object::open_container (object *new_container)
2513	{	2625	{
2514	if (container == new_container)	2626	if (container == new_container)
…		…
2535	container = 0;	2647	container = 0;
2536		2648
2537	// client needs item update to make it work, client bug requires this to be separate	2649	// client needs item update to make it work, client bug requires this to be separate
2538	esrv_update_item (UPD_FLAGS, this, old_container);	2650	esrv_update_item (UPD_FLAGS, this, old_container);
2539		2651
2540	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2652	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2541	play_sound (sound_find ("chest_close"));	2653	play_sound (sound_find ("chest_close"));
2542	}	2654	}
2543		2655
2544	if (new_container)	2656	if (new_container)
2545	{	2657	{
…		…
2549	// TODO: this does not seem to serve any purpose anymore?	2661	// TODO: this does not seem to serve any purpose anymore?
2550	#if 0	2662	#if 0
2551	// insert the "Close Container" object.	2663	// insert the "Close Container" object.
2552	if (archetype *closer = new_container->other_arch)	2664	if (archetype *closer = new_container->other_arch)
2553	{	2665	{
2554	object *closer = arch_to_object (new_container->other_arch);	2666	object *closer = new_container->other_arch->instance ();
2555	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2667	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2556	new_container->insert (closer);	2668	new_container->insert (closer);
2557	}	2669	}
2558	#endif	2670	#endif
2559		2671
2560	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2672	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2561		2673
2562	// make sure the container is available, client bug requires this to be separate	2674	// make sure the container is available, client bug requires this to be separate
2563	esrv_send_item (this, new_container);	2675	esrv_send_item (this, new_container);
2564		2676
2565	new_container->flag [FLAG_APPLIED] = true;	2677	new_container->flag [FLAG_APPLIED] = true;
…		…
2572	}	2684	}
2573	// else if (!old_container->env && contr && contr->ns)	2685	// else if (!old_container->env && contr && contr->ns)
2574	// contr->ns->floorbox_reset ();	2686	// contr->ns->floorbox_reset ();
2575	}	2687	}
2576		2688
		2689	//-GPL
		2690
		2691	// prefetch some flat area around the player
		2692	static void
		2693	prefetch_surrounding_area (object *op, maptile *map, int range)
		2694	{
		2695	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2696	op->x - range , op->y - range ,
		2697	op->x + range + 1, op->y + range + 1);
		2698	rect->m;
		2699	++rect)
		2700	{
		2701	rect->m->touch ();
		2702	rect->m->activate ();
		2703	}
		2704	}
		2705
		2706	// prefetch a generous area around the player, also up and down
		2707	void
		2708	object::prefetch_surrounding_maps ()
		2709	{
		2710	prefetch_surrounding_area (this, map, 40);
		2711
		2712	if (maptile *m = map->tile_available (TILE_DOWN))
		2713	prefetch_surrounding_area (this, m, 20);
		2714
		2715	if (maptile *m = map->tile_available (TILE_UP))
		2716	prefetch_surrounding_area (this, m, 20);
		2717	}
		2718
		2719	//+GPL
		2720
2577	object *	2721	object *
2578	object::force_find (const shstr name)	2722	object::force_find (shstr_tmp name)
2579	{	2723	{
2580	/* cycle through his inventory to look for the MARK we want to	2724	/* cycle through his inventory to look for the MARK we want to
2581	* place	2725	* place
2582	*/	2726	*/
2583	for (object *tmp = inv; tmp; tmp = tmp->below)	2727	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2586		2730
2587	return 0;	2731	return 0;
2588	}	2732	}
2589		2733
2590	void	2734	void
		2735	object::force_set_timer (int duration)
		2736	{
		2737	this->duration = 1;
		2738	this->speed_left = -1.f;
		2739
		2740	this->set_speed (duration ? 1.f / duration : 0.f);
		2741	}
		2742
		2743	object *
2591	object::force_add (const shstr name, int duration)	2744	object::force_add (shstr_tmp name, int duration)
2592	{	2745	{
2593	if (object *force = force_find (name))	2746	if (object *force = force_find (name))
2594	force->destroy ();	2747	force->destroy ();
2595		2748
2596	object *force = get_archetype (FORCE_NAME);	2749	object *force = archetype::get (FORCE_NAME);
2597		2750
2598	force->slaying = name;	2751	force->slaying = name;
2599	force->stats.food = 1;	2752	force->force_set_timer (duration);
2600	force->speed_left = -1.f;
2601
2602	force->set_speed (duration ? 1.f / duration : 0.f);
2603	force->flag [FLAG_IS_USED_UP] = true;
2604	force->flag [FLAG_APPLIED] = true;	2753	force->flag [FLAG_APPLIED] = true;
2605		2754
2606	insert (force);	2755	return insert (force);
2607	}	2756	}
2608		2757
2609	void	2758	void
2610	object::play_sound (faceidx sound)	2759	object::play_sound (faceidx sound) const
2611	{	2760	{
2612	if (!sound)	2761	if (!sound)
2613	return;	2762	return;
2614		2763
2615	if (flag [FLAG_REMOVED])	2764	if (is_on_map ())
		2765	map->play_sound (sound, x, y);
		2766	else if (object *pl = in_player ())
		2767	pl->contr->play_sound (sound);
		2768	}
		2769
		2770	void
		2771	object::say_msg (const char *msg) const
		2772	{
		2773	if (is_on_map ())
		2774	map->say_msg (msg, x, y);
		2775	else if (object *pl = in_player ())
		2776	pl->contr->play_sound (sound);
		2777	}
		2778
		2779	void
		2780	object::make_noise ()
		2781	{
		2782	// we do not model noise in the map, so instead put
		2783	// a temporary light into the noise source
		2784	// could use the map instead, but that's less reliable for our
		2785	// goal, which is to make invisibility a bit harder to exploit
		2786
		2787	// currently only works sensibly for players
		2788	if (!is_player ())
2616	return;	2789	return;
2617		2790
2618	if (env)	2791	// find old force, or create new one
2619	{	2792	object *force = force_find (shstr_noise_force);
2620	if (object *pl = in_player ())	2793
2621	pl->contr->play_sound (sound);	2794	if (force)
2622	}	2795	force->speed_left = -1.f; // patch old speed up
2623	else	2796	else
2624	map->play_sound (sound, x, y);	2797	{
2625	}	2798	force = archetype::get (shstr_noise_force);
2626		2799
		2800	force->slaying = shstr_noise_force;
		2801	force->stats.food = 1;
		2802	force->speed_left = -1.f;
		2803
		2804	force->set_speed (1.f / 4.f);
		2805	force->flag [FLAG_IS_USED_UP] = true;
		2806	force->flag [FLAG_APPLIED] = true;
		2807
		2808	insert (force);
		2809	}
		2810	}
		2811
		2812	void object::change_move_type (MoveType mt)
		2813	{
		2814	if (move_type == mt)
		2815	return;
		2816
		2817	if (is_on_map ())
		2818	{
		2819	// we are on the map, so handle move_on/off effects
		2820	remove ();
		2821	move_type = mt;
		2822	map->insert (this, x, y, this);
		2823	}
		2824	else
		2825	move_type = mt;
		2826	}
		2827
		2828	/* object should be a player.
		2829	* we return the object the player has marked with the 'mark' command
		2830	* below. If no match is found (or object has changed), we return
		2831	* NULL. We leave it up to the calling function to print messages if
		2832	* nothing is found.
		2833	*/
		2834	object *
		2835	object::mark () const
		2836	{
		2837	if (contr && contr->mark && contr->mark->env == this)
		2838	return contr->mark;
		2839	else
		2840	return 0;
		2841	}
		2842
		2843	// put marked object first in the inventory
		2844	// this is used by identify-like spells so players can influence
		2845	// the order a bit.
		2846	void
		2847	object::splay_marked ()
		2848	{
		2849	if (object *marked = mark ())
		2850	splay (marked);
		2851	}
		2852

Diff Legend

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