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.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.368 by root, Wed Dec 5 19:03:26 2018 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
		5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7		8	*
8	This program is free software; you can redistribute it and/or modify	9	* 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	10	* the terms of the Affero GNU General Public License as published by the
10	the Free Software Foundation; either version 2 of the License, or	11	* Free Software Foundation, either version 3 of the License, or (at your
11	(at your option) any later version.	12	* option) any later version.
12		13	*
13	This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	17	* GNU General Public License for more details.
17		18	*
18	You should have received a copy of the GNU General Public License	19	* You should have received a copy of the Affero GNU General Public License
19	along with this program; if not, write to the Free Software	20	* and the GNU General Public License along with this program. If not, see
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	21	* <http://www.gnu.org/licenses/>.
21		22	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	23	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	24	*/
24		25
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying
27	variable. */
28	#include <global.h>	26	#include <global.h>
29	#include <stdio.h>	27	#include <stdio.h>
30	#include <sys/types.h>	28	#include <sys/types.h>
31	#include <sys/uio.h>	29	#include <sys/uio.h>
32	#include <object.h>	30	#include <object.h>
33	#include <funcpoint.h>	31	#include <sproto.h>
34	#include <loader.h>
35		32
36	#include <bitset>	33	#include <bitset>
37		34
38	int nrofallocobjects = 0;	35	UUID UUID::cur;
39	static UUID uuid;	36	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
41		39
42	objectvec objects;	40	objectvec objects;
43	activevec actives;	41	activevec actives;
44		42
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	freelist_item *object::freelist;
		44	uint32_t object::object_count;
		45	uint32_t object::free_count;
		46	uint32_t object::create_count;
		47	uint32_t object::destroy_count;
		48
		49	//+GPL
		50
		51	int freearr_x[SIZEOFFREE] = {
		52	0,
		53	0, 1, 1, 1, 0, -1, -1, -1,
		54	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	55	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	56	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	57	int freearr_y[SIZEOFFREE] = {
		58	0,
		59	-1, -1, 0, 1, 1, 1, 0, -1,
		60	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	61	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	62	};
54	int freedir[SIZEOFFREE] = {	63	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	64	0,
		65	1, 2, 3, 4, 5, 6, 7, 8,
		66	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	67	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	68	};
58		69
		70	static int maxfree[SIZEOFFREE] = {
		71	0,
		72	9, 10, 13, 14, 17, 18, 21, 22,
		73	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		74	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		75	};
		76
		77	const char *wall_suffix[16] = {
		78	"0",
		79	"1_3",
		80	"1_4",
		81	"2_1_2",
		82	"1_2",
		83	"2_2_4",
		84	"2_2_1",
		85	"3_1",
		86	"1_1",
		87	"2_2_3",
		88	"2_2_2",
		89	"3_3",
		90	"2_1_1",
		91	"3_4",
		92	"3_2",
		93	"4"
		94	};
		95
59	static void	96	static void
60	write_uuid (void)	97	write_uuid (uval64 skip, bool sync)
61	{	98	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	99	CALL_BEGIN (2);
63		100	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	101	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	102	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		103	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	104	}
79		105
80	static void	106	static void
81	read_uuid (void)	107	read_uuid ()
82	{	108	{
83	char filename[MAX_BUF];	109	char filename[MAX_BUF];
84		110
85	sprintf (filename, "%s/uuid", settings.localdir);	111	sprintf (filename, "%s/uuid", settings.localdir);
		112
		113	seq_next_save = 0;
86		114
87	FILE *fp;	115	FILE *fp;
88		116
89	if (!(fp = fopen (filename, "r")))	117	if (!(fp = fopen (filename, "r")))
90	{	118	{
91	if (errno == ENOENT)	119	if (errno == ENOENT)
92	{	120	{
93	LOG (llevInfo, "RESET uid to 1\n");	121	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	122	UUID::cur.seq = 0;
95	write_uuid ();	123	write_uuid (UUID_GAP, true);
96	return;	124	return;
97	}	125	}
98		126
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	127	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	128	_exit (1);
101	}	129	}
102		130
103	int version;	131	char buf [UUID::MAX_LEN];
104	unsigned long long uid;	132	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	133	fgets (buf, sizeof (buf), fp);
		134
		135	if (!UUID::cur.parse (buf))
106	{	136	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	137	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	138	_exit (1);
109	}	139	}
110		140
111	uuid.seq = uid;	141	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	142
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	143	write_uuid (UUID_GAP, true);
114	fclose (fp);	144	fclose (fp);
115	}	145	}
116		146
117	UUID	147	UUID
118	gen_uuid ()	148	UUID::gen ()
119	{	149	{
120	UUID uid;	150	UUID uid;
121		151
122	uid.seq = ++uuid.seq;	152	uid.seq = ++cur.seq;
123		153
124	if (!(uuid.seq & (UUID_SKIP - 1)))	154	if (ecb_expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	155	{
		156	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		157	write_uuid (UUID_GAP, false);
		158	}
		159
126		160
127	return uid;	161	return uid;
128	}	162	}
129		163
130	void	164	void
131	init_uuid ()	165	UUID::init ()
132	{	166	{
133	read_uuid ();	167	read_uuid ();
134	}	168	}
135		169
		170	bool
		171	UUID::parse (const char *s)
		172	{
		173	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		174	return false;
		175
		176	seq = 0;
		177
		178	while (*s != '>')
		179	{
		180	if (*s < '0')
		181	return false;
		182
		183	// this gives nice branchless code with gcc
		184	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		185	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		186
		187	seq = (seq << 4) | digit;
		188
		189	++s;
		190	}
		191
		192	return true;
		193	}
		194
		195	char *
		196	UUID::append (char *buf) const
		197	{
		198	*buf++ = '<';
		199	*buf++ = '1';
		200	*buf++ = '.';
		201
		202	uint64_t seq = this->seq;
		203	const int bits = 64;
		204	char nz = 0;
		205	static const char tohex [] = "0123456789abcdef";
		206
		207	// assert (len >= 3 + bits / 4 + 1 + 1);
		208	for (int i = bits / 4; --i; )
		209	{
		210	uint8_t digit = seq >> (bits - 4);
		211
		212	*buf = tohex [digit];
		213	nz |= digit;
		214	buf += nz ? 1 : 0;
		215	seq <<= 4;
		216	}
		217
		218	// last digit is special - always emit
		219	uint8_t digit = seq >> (bits - 4);
		220	*buf++ = tohex [digit];
		221
		222	*buf++ = '>';
		223
		224	return buf;
		225	}
		226
		227	char *
		228	UUID::c_str () const
		229	{
		230	static char buf [MAX_LEN];
		231	*append (buf) = 0;
		232	return buf;
		233	}
		234
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	235	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	236	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	237	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	238	{
140	key_value *wants_field;
141
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	239	/* n-squared behaviour (see kv.get), but I'm hoping both
143	* objects with lists are rare, and lists stay short. If not, use a	240	* objects with lists are rare, and lists stay short. If not, use a
144	* different structure or at least keep the lists sorted...	241	* different structure or at least keep the lists sorted...
145	*/	242	*/
146		243
147	/* For each field in wants, */	244	/* For each field in wants, */
148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	245	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
149	{	246	if (has->kv.get (kv->key) != kv->value)
150	key_value *has_field;	247	return false;
151
152	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);
154
155	if (has_field == NULL)
156	{
157	/* No field with that name. */
158	return FALSE;
159	}
160
161	/* Found the matching field. */
162	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167
168	/* If we get here, we found a match. Now for the next field in wants. */
169	}
170		248
171	/* If we get here, every field in wants has a matching field in has. */	249	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	250	return true;
173	}	251	}
174		252
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	253	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	254	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	255	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	256	{
179	/* However, there may be fields in has which aren't partnered in wants,	257	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	258	* so we need to run the comparison *twice*. :(
181	*/	259	*/
182	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	260	return compare_ob_value_lists_one (ob1, ob2)
		261	&& compare_ob_value_lists_one (ob2, ob1);
183	}	262	}
184		263
185	/* Function examines the 2 objects given to it, and returns true if	264	/* Function examines the 2 objects given to it, and returns true if
186	* they can be merged together.	265	* they can be merged together.
187	*	266	*
…		…
194	* Improvements made with merge: Better checking on potion, and also	273	* Improvements made with merge: Better checking on potion, and also
195	* check weight	274	* check weight
196	*/	275	*/
197	bool object::can_merge_slow (object *ob1, object *ob2)	276	bool object::can_merge_slow (object *ob1, object *ob2)
198	{	277	{
199	/* A couple quicksanity checks */	278	/* A couple quick sanity checks */
200	if (ob1 == ob2	279	if (ob1 == ob2
201	|| ob1->type != ob2->type	280	|| ob1->type != ob2->type
202	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	281	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	282	|| ob1->name != ob2->name
		283	|| ob1->custom_name != ob2->custom_name
		284	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
205	return 0;	285	return 0;
206		286
207	//TODO: this ain't working well, use nicer and correct overflow check
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	287	/* Do not merge objects if nrof would overflow, assume nrof
209	* value could not be stored in a sint32 (which unfortunately sometimes is	288	* is always 0 .. 2**31-1 */
210	* used to store nrof).	289	if (ob1->nrof > 0x7fffffff - ob2->nrof)
211	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)
213	return 0;	290	return 0;
214		291
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	292	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	293	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	294	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	295	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	296	* flags lose any meaning.
220	*/	297	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	298	if (ob1->flag [FLAG_IDENTIFIED])
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	299	ob1->set_flag (FLAG_BEEN_APPLIED);
223		300
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	301	if (ob2->flag [FLAG_IDENTIFIED])
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	302	ob2->set_flag (FLAG_BEEN_APPLIED);
226		303
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	304	if (ob1->arch->archname != ob2->arch->archname
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	305	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	306	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	307	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	308	|| ob1->weight != ob2->weight
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235	|| ob1->attacktype != ob2->attacktype	309	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	310	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	311	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	312	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	313	|| ob1->value != ob2->value
240	|| ob1->animation_id != ob2->animation_id	314	|| ob1->animation_id != ob2->animation_id
		315	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
241	|| ob1->client_type != ob2->client_type	316	|| ob1->client_type != ob2->client_type
242	|| ob1->materialname != ob2->materialname	317	|| ob1->material != ob2->material
243	|| ob1->lore != ob2->lore	318	|| ob1->lore != ob2->lore
244	|| ob1->subtype != ob2->subtype	319	|| ob1->subtype != ob2->subtype
245	|| ob1->move_type != ob2->move_type	320	|| ob1->move_type != ob2->move_type
246	|| ob1->move_block != ob2->move_block	321	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	322	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	323	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	324	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	325	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	326	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
		327	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		328	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	329	return 0;
253		330
		331	if ((ob1->flag ^ ob2->flag)
		332	.reset (FLAG_INV_LOCKED)
		333	.reset (FLAG_REMOVED)
		334	.any ())
		335	return 0;
		336
254	/* This is really a spellbook check - really, we should	337	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	338	* not merge objects with real inventories, as splitting them
		339	* is hard.
256	*/	340	*/
257	if (ob1->inv || ob2->inv)	341	if (ob1->inv || ob2->inv)
258	{	342	{
259	/* if one object has inventory but the other doesn't, not equiv */	343	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	344	return 0; /* inventories differ in length */
261	return 0;
262		345
263	/* Now check to see if the two inventory objects could merge */	346	if (ob1->inv->below || ob2->inv->below)
		347	return 0; /* more than one object in inv */
		348
264	if (!object::can_merge (ob1->inv, ob2->inv))	349	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	350	return 0; /* inventory objects differ */
266		351
267	/* inventory ok - still need to check rest of this object to see	352	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	353	* if it is valid.
269	*/	354	*/
270	}	355	}
271		356
272	/* Don't merge objects that are applied. With the new 'body' code,	357	/* Don't merge objects that are applied. With the new 'body' code,
273	* it is possible for most any character to have more than one of	358	* it is possible for most any character to have more than one of
274	* some items equipped, and we don't want those to merge.	359	* some items equipped, and we don't want those to merge.
275	*/	360	*/
276	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	361	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
277	return 0;	362	return 0;
278		363
279	/* Note sure why the following is the case - either the object has to	364	/* Not sure why the following is the case - either the object has to
280	* be animated or have a very low speed. Is this an attempted monster	365	* be animated or have a very low speed. Is this an attempted monster
281	* check?	366	* check?
282	*/	367	*/
283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	368	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
284	return 0;	369	return 0;
285		370
286	switch (ob1->type)	371	switch (ob1->type)
287	{	372	{
288	case SCROLL:	373	case SCROLL:
289	if (ob1->level != ob2->level)	374	if (ob1->level != ob2->level)
290	return 0;	375	return 0;
291	break;	376	break;
292	}	377	}
293		378
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	379	if (!ob1->kv.empty () || !ob2->kv.empty ())
295	{	380	{
296	/* At least one of these has key_values. */	381	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	382	if (ob1->kv.empty () != ob2->kv.empty ())
298	/* One has fields, but the other one doesn't. */	383	return 0; /* One has fields, but the other one doesn't. */
		384
		385	if (!compare_ob_value_lists (ob1, ob2))
299	return 0;	386	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;
302	}	387	}
303		388
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	389	if (ob1->self || ob2->self)
306	{	390	{
307	ob1->optimise ();	391	ob1->optimise ();
308	ob2->optimise ();	392	ob2->optimise ();
309		393
310	if (ob1->self || ob2->self)	394	if (ob1->self || ob2->self)
		395	{
		396	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		397	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		398
		399	if (k1 != k2)
311	return 0;	400	return 0;
		401
		402	if (k1 == 0)
		403	return 1;
		404
		405	if (!cfperl_can_merge (ob1, ob2))
		406	return 0;
		407	}
312	}	408	}
313		409
314	/* Everything passes, must be OK. */	410	/* Everything passes, must be OK. */
315	return 1;	411	return 1;
316	}	412	}
317		413
		414	// find player who can see this object
		415	object *
		416	object::visible_to () const
		417	{
		418	if (client_visible () && !flag [FLAG_REMOVED])
		419	{
		420	// see if we are in a container of sorts
		421	if (env)
		422	{
		423	// the player inventory itself is always visible
		424	if (env->is_player ())
		425	return env;
		426
		427	// else a player could have our env open
		428	object *envest = env->outer_env_or_self ();
		429
		430	// the player itself is always on a map, so we will find him here
		431	// even if our inv is in a player.
		432	if (envest->is_on_map ())
		433	if (object *pl = envest->ms ().player ())
		434	if (pl->container_ () == env)
		435	return pl;
		436	}
		437	else
		438	{
		439	// maybe there is a player standing on the same mapspace
		440	// this will catch the case where "this" is a player
		441	if (object *pl = ms ().player ())
		442	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		443	|| pl->container_ () == this)
		444	return pl;
		445	}
		446	}
		447
		448	return 0;
		449	}
		450
		451	// adjust weight per container type ("of holding")
		452	static weight_t
		453	weight_adjust_for (object *op, weight_t weight)
		454	{
		455	if (op->type == CONTAINER)
		456	weight -= weight * op->stats.Str / 100;
		457
		458	return weight;
		459	}
		460
318	/*	461	/*
		462	* subtracts, then adds, the specified weight to an object,
		463	* and also updates how much the environment(s) is/are carrying.
		464	*/
		465	static void
		466	adjust_weight (object *op, weight_t sub, weight_t add)
		467	{
		468	while (op)
		469	{
		470	weight_t carrying = (weight_t)op->carrying
		471	- weight_adjust_for (op, sub)
		472	+ weight_adjust_for (op, add);
		473
		474	sub = op->carrying;
		475	op->carrying = carrying;
		476	add = op->carrying;
		477
		478	if (object *pl = op->visible_to ())
		479	if (pl != op) // player is handled lazily
		480	esrv_update_item (UPD_WEIGHT, pl, op);
		481
		482	op = op->env;
		483	}
		484	}
		485
		486	/*
319	* sum_weight() is a recursive function which calculates the weight	487	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	488	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	489	* containers are carrying, and sums it up.
322	*/	490	*/
323	long	491	void
324	sum_weight (object *op)	492	object::update_weight ()
325	{	493	{
326	long sum;	494	weight_t sum = 0;
327	object *inv;
328		495
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	496	for (object *op = inv; op; op = op->below)
330	{
331	if (inv->inv)
332	sum_weight (inv);
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	497	{
		498	op->update_weight ();
335		499
336	if (op->type == CONTAINER && op->stats.Str)	500	sum += weight_adjust_for (this, op->total_weight ());
337	sum = (sum * (100 - op->stats.Str)) / 100;	501	}
338		502
339	if (op->carrying != sum)	503	if (sum != carrying)
		504	{
		505	if (carrying != sum && carrying)//D
		506	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		507	(long long)sum, (long long)carrying, debug_desc ());
		508
340	op->carrying = sum;	509	carrying = sum;
341		510
342	return sum;	511	if (object *pl = visible_to ())
		512	if (pl != this) // player is handled lazily
		513	esrv_update_item (UPD_WEIGHT, pl, this);
		514	}
343	}	515	}
344		516
345	/**	517	/*
346	* Return the outermost environment object for a given object.	518	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
347	*/	519	*/
348
349	object *
350	object_get_env_recursive (object *op)
351	{
352	while (op->env != NULL)
353	op = op->env;
354	return op;
355	}
356
357	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.
361	*/
362
363	char *	520	char *
364	dump_object (object *op)	521	dump_object (object *op)
365	{	522	{
366	if (!op)	523	if (!op)
367	return strdup ("[NULLOBJ]");	524	return strdup ("[NULLOBJ]");
368		525
369	object_freezer freezer;	526	object_freezer freezer;
370	save_object (freezer, op, 1);	527	op->write (freezer);
371	return freezer.as_string ();	528	return freezer.as_string ();
372	}	529	}
373		530
374	/*	531	char *
375	* get_nearest_part(multi-object, object 2) returns the part of the	532	object::as_string ()
376	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.
378	*/
379
380	object *
381	get_nearest_part (object *op, const object *pl)
382	{	533	{
383	object *tmp, *closest;	534	return dump_object (this);
384	int last_dist, i;
385
386	if (op->more == NULL)
387	return op;
388	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
389	if ((i = distance (tmp, pl)) < last_dist)
390	closest = tmp, last_dist = i;
391	return closest;
392	}	535	}
393		536
394	/*	537	/*
395	* Returns the object which has the count-variable equal to the argument.	538	* Returns the object which has the count-variable equal to the argument.
		539	* VERRRY slow.
396	*/	540	*/
397	object *	541	object *
398	find_object (tag_t i)	542	find_object (tag_t i)
399	{	543	{
400	return ((unsigned int)i) < objects.size ()	544	for_all_objects (op)
401	? objects [i]	545	if (op->count == i)
402	: 0;	546	return op;
		547
		548	return 0;
		549	}
		550
		551	/*
		552	* Returns the object which has the uuid equal to the argument.
		553	* MOAR VERRRY slow.
		554	*/
		555
		556	object *
		557	find_object_uuid (UUID i)
		558	{
		559	for_all_objects (op)
		560	if (op->uuid == i)
		561	return op;
		562
		563	return 0;
403	}	564	}
404		565
405	/*	566	/*
406	* Returns the first object which has a name equal to the argument.	567	* Returns the first object which has a name equal to the argument.
407	* Used only by the patch command, but not all that useful.	568	* Used only by the patch command, but not all that useful.
…		…
409	*/	570	*/
410	object *	571	object *
411	find_object_name (const char *str)	572	find_object_name (const char *str)
412	{	573	{
413	shstr_cmp str_ (str);	574	shstr_cmp str_ (str);
414	object *op;
415		575
		576	if (str_)
416	for_all_objects (op)	577	for_all_objects (op)
417	if (op->name == str_)	578	if (op->name == str_)
418	break;	579	return op;
419		580
420	return op;	581	return 0;
421	}
422
423	void
424	free_all_object_data ()
425	{
426	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
427	}	582	}
428		583
429	/*	584	/*
430	* Sets the owner and sets the skill and exp pointers to owner's current	585	* Sets the owner and sets the skill and exp pointers to owner's current
431	* skill and experience objects.	586	* skill and experience objects.
		587	* ACTUALLY NO! investigate! TODO
432	*/	588	*/
433	void	589	void
434	object::set_owner (object *owner)	590	object::set_owner (object *owner)
435	{	591	{
		592	// allow objects which own objects
436	if (!owner)	593	if (owner)
437	return;
438
439	/* next line added to allow objects which own objects */
440	/* Add a check for ownercounts in here, as I got into an endless loop
441	* with the fireball owning a poison cloud which then owned the
442	* fireball. I believe that was caused by one of the objects getting
443	* freed and then another object replacing it. Since the ownercounts
444	* didn't match, this check is valid and I believe that cause is valid.
445	*/
446	while (owner->owner)	594	while (owner->owner)
447	owner = owner->owner;	595	owner = owner->owner;
		596
		597	if (flag [FLAG_FREED])
		598	{
		599	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		600	return;
		601	}
448		602
449	this->owner = owner;	603	this->owner = owner;
450	}
451
452	/* Zero the key_values on op, decrementing the shared-string
453	* refcounts and freeing the links.
454	*/
455	static void
456	free_key_values (object *op)
457	{
458	for (key_value *i = op->key_values; i != 0;)
459	{
460	key_value *next = i->next;
461	delete i;
462
463	i = next;
464	}
465
466	op->key_values = 0;
467	}	604	}
468		605
469	/*	606	/*
470	* copy_to first frees everything allocated by the dst object,	607	* copy_to first frees everything allocated by the dst object,
471	* and then copies the contents of itself into the second	608	* and then copies the contents of itself into the second
…		…
475	* will point at garbage.	612	* will point at garbage.
476	*/	613	*/
477	void	614	void
478	object::copy_to (object *dst)	615	object::copy_to (object *dst)
479	{	616	{
480	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	617	dst->remove ();
481	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
482
483	*(object_copy *)dst = *this;	618	*(object_copy *)dst = *this;
484		619
485	if (is_freed)	620	// maybe move to object_copy?
486	SET_FLAG (dst, FLAG_FREED);	621	dst->kv = kv;
487		622
488	if (is_removed)	623	dst->flag [FLAG_REMOVED] = true;
489	SET_FLAG (dst, FLAG_REMOVED);	624	dst->activate ();
		625	}
490		626
491	if (speed < 0)	627	void
492	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	628	object::instantiate ()
		629	{
		630	if (!uuid.seq) // HACK
		631	uuid = UUID::gen ();
493		632
494	/* Copy over key_values, if any. */	633	// TODO: unclean state changes, should not be done in copy_to AND instantiate
495	if (key_values)	634	if (flag [FLAG_RANDOM_SPEED] && speed)
496	{	635	speed_left = - speed - rndm (); // TODO animation
497	key_value *tail = 0;	636	else
498	key_value *i;	637	speed_left = -1.;
499		638
500	dst->key_values = 0;	639	/* copy the body_info to the body_used - this is only really
		640	* need for monsters, but doesn't hurt to do it for everything.
		641	* by doing so, when a monster is created, it has good starting
		642	* values for the body_used info, so when items are created
		643	* for it, they can be properly equipped.
		644	*/
		645	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		646	slot[i].used = slot[i].info;
501		647
502	for (i = key_values; i; i = i->next)	648	attachable::instantiate ();
503	{
504	key_value *new_link = new key_value;
505
506	new_link->next = 0;
507	new_link->key = i->key;
508	new_link->value = i->value;
509
510	/* Try and be clever here, too. */
511	if (!dst->key_values)
512	{
513	dst->key_values = new_link;
514	tail = new_link;
515	}
516	else
517	{
518	tail->next = new_link;
519	tail = new_link;
520	}
521	}
522	}
523
524	dst->set_speed (dst->speed);
525	}	649	}
526		650
527	object *	651	object *
528	object::clone ()	652	object::clone ()
529	{	653	{
530	object *neu = create ();	654	object *neu = create ();
531	copy_to (neu);	655	copy_to (neu);
		656
		657	// TODO: unclean state changes, should not be done in clone AND instantiate
		658	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		659	neu->speed_left = - neu->speed - rndm (); // TODO animation
		660
		661	neu->map = map; // not copied by copy_to
532	return neu;	662	return neu;
		663	}
		664
		665	// update the anhimation frame of an object, but only if it has an animation
		666	// assigned and the frame number if within the animation.
		667	void object::update_anim_frame (int frame)
		668	{
		669	if (ecb_expect_false (!has_anim () || frame >= anim_frames ()))
		670	return;
		671
		672	set_anim_frame (frame);
		673	update_object (this, UP_OBJ_FACE);
533	}	674	}
534		675
535	/*	676	/*
536	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
537	* to the closest player being on the other side, this function can	678	* to the closest player being on the other side, this function can
538	* be called to update the face variable, _and_ how it looks on the map.	679	* be called to update the face variable, _and_ how it looks on the map.
539	*/	680	*/
540	void	681	void
541	update_turn_face (object *op)	682	update_turn_face (object *op)
542	{	683	{
543	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	684	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
544	return;	685	return;
545		686
546	SET_ANIMATION (op, op->direction);	687	op->update_anim_frame (op->direction);
547	update_object (op, UP_OBJ_FACE);
548	}	688	}
549		689
550	/*	690	/*
551	* Updates the speed of an object. If the speed changes from 0 to another	691	* Updates the speed of an object. If the speed changes from 0 to another
552	* value, or vice versa, then add/remove the object from the active list.	692	* value, or vice versa, then add/remove the object from the active list.
553	* This function needs to be called whenever the speed of an object changes.	693	* This function needs to be called whenever the speed of an object changes.
554	*/	694	*/
555	void	695	void
556	object::set_speed (float speed)	696	object::set_speed (float speed)
557	{	697	{
558	if (flag [FLAG_FREED] && speed)
559	{
560	LOG (llevError, "Object %s is freed but has speed.\n", &name);
561	speed = 0;
562	}
563
564	this->speed = speed;	698	this->speed = speed;
565		699
566	if (has_active_speed ())	700	if (has_active_speed ())
567	activate ();	701	activate ();
568	else	702	else
569	deactivate ();	703	deactivate ();
570	}	704	}
571		705
572	/*	706	/*
573	* update_object() updates the the map.	707	* update_object() updates the map.
574	* It takes into account invisible objects (and represent squares covered	708	* It takes into account invisible objects (and represent squares covered
575	* by invisible objects by whatever is below them (unless it's another	709	* by invisible objects by whatever is below them (unless it's another
576	* invisible object, etc...)	710	* invisible object, etc...)
577	* If the object being updated is beneath a player, the look-window	711	* If the object being updated is beneath a player, the look-window
578	* of that player is updated (this might be a suboptimal way of	712	* of that player is updated (this might be a suboptimal way of
…		…
587	* UP_OBJ_FACE: only the objects face has changed.	721	* UP_OBJ_FACE: only the objects face has changed.
588	*/	722	*/
589	void	723	void
590	update_object (object *op, int action)	724	update_object (object *op, int action)
591	{	725	{
592	MoveType move_on, move_off, move_block, move_slow;	726	if (!op)
593
594	if (op == NULL)
595	{	727	{
596	/* this should never happen */	728	/* this should never happen */
597	LOG (llevDebug, "update_object() called for NULL object.\n");	729	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
598	return;	730	return;
599	}	731	}
600		732
601	if (op->env)	733	if (!op->is_on_map ())
602	{	734	{
603	/* Animation is currently handled by client, so nothing	735	/* Animation is currently handled by client, so nothing
604	* to do in this case.	736	* to do in this case.
605	*/	737	*/
606	return;	738	return;
607	}	739	}
608
609	/* If the map is saving, don't do anything as everything is
610	* going to get freed anyways.
611	*/
612	if (!op->map || op->map->in_memory == MAP_SAVING)
613	return;
614		740
615	/* make sure the object is within map boundaries */	741	/* make sure the object is within map boundaries */
616	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	742	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
617	{	743	{
618	LOG (llevError, "update_object() called for object out of map!\n");	744	LOG (llevError, "update_object() called for object out of map!\n");
…		…
623	}	749	}
624		750
625	mapspace &m = op->ms ();	751	mapspace &m = op->ms ();
626		752
627	if (!(m.flags_ & P_UPTODATE))	753	if (!(m.flags_ & P_UPTODATE))
628	/* nop */;	754	m.update_up (); // nothing to do except copy up
629	else if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
630	{	756	{
		757	#if 0
631	// this is likely overkill, TODO: revisit (schmorp)	758	// this is likely overkill, TODO: revisit (schmorp)
632	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	759	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
633	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	760	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
634	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	761	|| (op->is_player () && !(m.flags_ & P_PLAYER))
635	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	762	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
636	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	763	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
637	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	764	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
638	|| (m.move_on | op->move_on ) != m.move_on	765	|| (m.move_on | op->move_on ) != m.move_on
639	|| (m.move_off | op->move_off ) != m.move_off	766	|| (m.move_off | op->move_off ) != m.move_off
640	|| (m.move_slow | op->move_slow) != m.move_slow	767	|| (m.move_slow | op->move_slow) != m.move_slow
641	/* This isn't perfect, but I don't expect a lot of objects to	768	/* This isn't perfect, but I don't expect a lot of objects to
642	* to have move_allow right now.	769	* have move_allow right now.
643	*/	770	*/
644	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	771	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		772	m.invalidate ();
		773	#else
645	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	774	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
646	m.flags_ = 0;	775	m.invalidate ();
		776	#endif
647	}	777	}
648	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
649	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
650	* that is being removed.	780	* that is being removed.
651	*/	781	*/
652	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
653	m.flags_ = 0;	783	m.invalidate ();
654	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
655	/* Nothing to do for that case */ ;	785	m.update_up (); // nothing to do for that case, except copy up
656	else	786	else
657	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
658		788
659	if (op->more)	789	if (op->more)
660	update_object (op->more, action);	790	update_object (op->more, action);
661	}	791	}
662		792
663	object *object::first;
664
665	object::object ()	793	object::object ()
666	{	794	{
667	SET_FLAG (this, FLAG_REMOVED);	795	this->set_flag (FLAG_REMOVED);
668		796
669	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
670	face = blank_face;	798	face = blank_face;
		799	material = MATERIAL_NULL;
671	}	800	}
672		801
673	object::~object ()	802	object::~object ()
674	{	803	{
675	free_key_values (this);	804	unlink ();
		805
		806	kv.clear ();
676	}	807	}
677		808
678	void object::link ()	809	void object::link ()
679	{	810	{
680	uuid = gen_uuid ();	811	assert (!index);//D
		812	uuid = UUID::gen ();
681		813
		814	refcnt_inc ();
682	objects.insert (this);	815	objects.insert (this);
		816
		817	++create_count;
		818
683	}	819	}
684		820
685	void object::unlink ()	821	void object::unlink ()
686	{	822	{
		823	if (!index)
		824	return;
		825
		826	++destroy_count;
		827
687	objects.erase (this);	828	objects.erase (this);
		829	refcnt_dec ();
688	}	830	}
689		831
690	void	832	void
691	object::activate ()	833	object::activate ()
692	{	834	{
693	/* If already on active list, don't do anything */	835	/* If already on active list, don't do anything */
694	if (active)	836	if (active)
695	return;	837	return;
696		838
697	if (has_active_speed ())	839	if (has_active_speed ())
		840	{
		841	if (flag [FLAG_FREED])
		842	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		843
698	actives.insert (this);	844	actives.insert (this);
		845	}
699	}	846	}
700		847
701	void	848	void
702	object::activate_recursive ()	849	object::activate_recursive ()
703	{	850	{
…		…
707	op->activate_recursive ();	854	op->activate_recursive ();
708	}	855	}
709		856
710	/* This function removes object 'op' from the list of active	857	/* This function removes object 'op' from the list of active
711	* objects.	858	* objects.
712	* This should only be used for style maps or other such	859	* This should only be used for style maps or other such
713	* reference maps where you don't want an object that isn't	860	* reference maps where you don't want an object that isn't
714	* in play chewing up cpu time getting processed.	861	* in play chewing up cpu time getting processed.
715	* The reverse of this is to call update_ob_speed, which	862	* The reverse of this is to call update_ob_speed, which
716	* will do the right thing based on the speed of the object.	863	* will do the right thing based on the speed of the object.
717	*/	864	*/
…		…
752	object::destroy_inv (bool drop_to_ground)	899	object::destroy_inv (bool drop_to_ground)
753	{	900	{
754	// need to check first, because the checks below might segfault	901	// need to check first, because the checks below might segfault
755	// as we might be on an invalid mapspace and crossfire code	902	// as we might be on an invalid mapspace and crossfire code
756	// is too buggy to ensure that the inventory is empty.	903	// is too buggy to ensure that the inventory is empty.
757	// corollary: if you create arrows etc. with stuff in tis inventory,	904	// corollary: if you create arrows etc. with stuff in its inventory,
758	// cf will crash below with off-map x and y	905	// cf will crash below with off-map x and y
759	if (!inv)	906	if (!inv)
760	return;	907	return;
761		908
762	/* Only if the space blocks everything do we not process -	909	/* Only if the space blocks everything do we not process -
763	* if some form of movement is allowed, let objects	910	* if some form of movement is allowed, let objects
764	* drop on that space.	911	* drop on that space.
765	*/	912	*/
766	if (!drop_to_ground	913	if (!drop_to_ground
767	|| !map	914	|| !map
768	|| map->in_memory != MAP_IN_MEMORY	915	|| !map->linkable ()
		916	|| map->no_drop
769	|| ms ().move_block == MOVE_ALL)	917	|| ms ().move_block == MOVE_ALL)
770	{	918	{
771	while (inv)	919	while (inv)
772	{
773	inv->destroy_inv (drop_to_ground);
774	inv->destroy ();	920	inv->destroy ();
775	}
776	}	921	}
777	else	922	else
778	{ /* Put objects in inventory onto this space */	923	{ /* Put objects in inventory onto this space */
779	while (inv)	924	while (inv)
780	{	925	{
…		…
782		927
783	if (op->flag [FLAG_STARTEQUIP]	928	if (op->flag [FLAG_STARTEQUIP]
784	|| op->flag [FLAG_NO_DROP]	929	|| op->flag [FLAG_NO_DROP]
785	|| op->type == RUNE	930	|| op->type == RUNE
786	|| op->type == TRAP	931	|| op->type == TRAP
787	|| op->flag [FLAG_IS_A_TEMPLATE])	932	|| op->flag [FLAG_IS_A_TEMPLATE]
		933	|| op->flag [FLAG_DESTROY_ON_DEATH])
788	op->destroy ();	934	op->destroy ();
789	else	935	else
790	map->insert (op, x, y);	936	map->insert (op, x, y);
791	}	937	}
792	}	938	}
793	}	939	}
794		940
		941	/*
		942	* Remove and free all objects in the inventory of the given object.
		943	* Unlike destroy_inv, this assumes the *this is destroyed as well
		944	* well, so we can (and have to!) take shortcuts.
		945	*/
		946	void
		947	object::destroy_inv_fast ()
		948	{
		949	while (object *op = inv)
		950	{
		951	// remove from object the fast way
		952	op->flag [FLAG_REMOVED] = true;
		953	op->env = 0;
		954	if ((inv = inv->below))
		955	inv->above = 0;
		956
		957	// then destroy
		958	op->destroy ();
		959	}
		960	}
		961
		962	void
		963	object::freelist_free (int count)
		964	{
		965	while (count-- && freelist)
		966	{
		967	freelist_item *next = freelist->next;
		968	// count is being "destroyed"
		969
		970	sfree ((char *)freelist, sizeof (object));
		971
		972	freelist = next;
		973	--free_count;
		974	}
		975	}
		976
		977	object *
795	object *object::create ()	978	object::create ()
796	{	979	{
797	object *op = new object;	980	object *op;
		981
		982	if (freelist)
		983	{
		984	freelist_item li = *freelist;
		985	memset (freelist, 0, sizeof (object));
		986
		987	op = new (freelist) object;
		988	op->count = li.count;
		989
		990	freelist = li.next;
		991	--free_count;
		992	}
		993	else
		994	{
		995	void *ni = salloc0<char> (sizeof (object));
		996
		997	op = new(ni) object;
		998
		999	op->count = ++object_count;
		1000	}
		1001
798	op->link ();	1002	op->link ();
		1003
799	return op;	1004	return op;
800	}	1005	}
801		1006
802	void	1007	void
		1008	object::do_delete ()
		1009	{
		1010	uint32_t count = this->count;
		1011
		1012	this->~object ();
		1013
		1014	freelist_item *li = (freelist_item *)this;
		1015	li->next = freelist;
		1016	li->count = count;
		1017
		1018	freelist = li;
		1019	++free_count;
		1020	}
		1021
		1022	void
803	object::do_destroy ()	1023	object::do_destroy ()
804	{	1024	{
805	if (flag [FLAG_IS_LINKED])	1025	if (flag [FLAG_IS_LINKED])
806	remove_button_link (this);	1026	remove_link ();
807		1027
808	if (flag [FLAG_FRIENDLY])	1028	if (flag [FLAG_FRIENDLY])
809	remove_friendly_object (this);	1029	remove_friendly_object (this);
810		1030
811	if (!flag [FLAG_REMOVED])
812	remove ();	1031	remove ();
813		1032
814	if (flag [FLAG_FREED])	1033	attachable::do_destroy ();
815	return;
816		1034
817	set_speed (0);	1035	deactivate ();
		1036	unlink ();
818		1037
819	flag [FLAG_FREED] = 1;	1038	flag [FLAG_FREED] = 1;
820		1039
821	attachable::do_destroy ();
822
823	destroy_inv (true);
824	unlink ();
825
826	// hack to ensure that freed objects still have a valid map	1040	// hack to ensure that freed objects still have a valid map
827	{
828	static maptile *freed_map; // freed objects are moved here to avoid crashes
829
830	if (!freed_map)
831	{
832	freed_map = new maptile;
833
834	freed_map->name = "/internal/freed_objects_map";
835	freed_map->width = 3;
836	freed_map->height = 3;
837
838	freed_map->alloc ();
839	freed_map->in_memory = MAP_IN_MEMORY;
840	}
841
842	map = freed_map;	1041	map = &freed_map;
843	x = 1;	1042	x = 1;
844	y = 1;	1043	y = 1;
845	}
846
847	head = 0;
848		1044
849	if (more)	1045	if (more)
850	{	1046	{
851	more->destroy ();	1047	more->destroy ();
852	more = 0;	1048	more = 0;
853	}	1049	}
854		1050
		1051	head = 0;
		1052
855	// clear those pointers that likely might have circular references to us	1053	// clear those pointers that likely might cause circular references
856	owner = 0;	1054	owner = 0;
857	enemy = 0;	1055	enemy = 0;
858	attacked_by = 0;	1056	attacked_by = 0;
		1057	current_weapon = 0;
859	}	1058	}
860		1059
861	void	1060	void
862	object::destroy (bool destroy_inventory)	1061	object::destroy ()
863	{	1062	{
864	if (destroyed ())	1063	if (destroyed ())
865	return;	1064	return;
866		1065
867	if (destroy_inventory)	1066	if (!is_head () && !head->destroyed ())
		1067	{
		1068	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1069	head->destroy ();
		1070	return;
		1071	}
		1072
868	destroy_inv (false);	1073	destroy_inv_fast ();
		1074
		1075	if (is_head ())
		1076	if (sound_destroy)
		1077	play_sound (sound_destroy);
		1078	else if (flag [FLAG_MONSTER])
		1079	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
869		1080
870	attachable::destroy ();	1081	attachable::destroy ();
871	}
872
873	/*
874	* sub_weight() recursively (outwards) subtracts a number from the
875	* weight of an object (and what is carried by it's environment(s)).
876	*/
877	void
878	sub_weight (object *op, signed long weight)
879	{
880	while (op != NULL)
881	{
882	if (op->type == CONTAINER)
883	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
884
885	op->carrying -= weight;
886	op = op->env;
887	}
888	}	1082	}
889		1083
890	/* op->remove ():	1084	/* op->remove ():
891	* This function removes the object op from the linked list of objects	1085	* This function removes the object op from the linked list of objects
892	* which it is currently tied to. When this function is done, the	1086	* which it is currently tied to. When this function is done, the
893	* object will have no environment. If the object previously had an	1087	* object will have no environment. If the object previously had an
894	* environment, the x and y coordinates will be updated to	1088	* environment, the x and y coordinates will be updated to
895	* the previous environment.	1089	* the previous environment.
896	* Beware: This function is called from the editor as well!
897	*/	1090	*/
898	void	1091	void
899	object::remove ()	1092	object::do_remove ()
900	{	1093	{
901	object *tmp, *last = 0;	1094	if (flag [FLAG_REMOVED])
902	object *otmp;
903
904	if (QUERY_FLAG (this, FLAG_REMOVED))
905	return;	1095	return;
906		1096
907	SET_FLAG (this, FLAG_REMOVED);
908	INVOKE_OBJECT (REMOVE, this);	1097	INVOKE_OBJECT (REMOVE, this);
		1098
		1099	flag [FLAG_REMOVED] = true;
909		1100
910	if (more)	1101	if (more)
911	more->remove ();	1102	more->remove ();
912		1103
913	/*	1104	/*
914	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
915	* inventory.	1106	* inventory.
916	*/	1107	*/
917	if (env)	1108	if (env)
918	{	1109	{
919	if (nrof)	1110	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
920	sub_weight (env, weight * nrof);	1111	if (object *pl = visible_to ())
921	else	1112	esrv_del_item (pl->contr, count);
922	sub_weight (env, weight + carrying);	1113	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
923		1114
924	/* NO_FIX_PLAYER is set when a great many changes are being	1115	adjust_weight (env, total_weight (), 0);
925	* made to players inventory. If set, avoiding the call
926	* to save cpu time.
927	*/
928	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
929	otmp->update_stats ();
930		1116
931	if (above)	1117	object *pl = in_player ();
932	above->below = below;
933	else
934	env->inv = below;
935
936	if (below)
937	below->above = above;
938		1118
939	/* we set up values so that it could be inserted into	1119	/* we set up values so that it could be inserted into
940	* the map, but we don't actually do that - it is up	1120	* the map, but we don't actually do that - it is up
941	* to the caller to decide what we want to do.	1121	* to the caller to decide what we want to do.
942	*/	1122	*/
943	x = env->x, y = env->y;
944	map = env->map;	1123	map = env->map;
945	above = 0, below = 0;	1124	x = env->x;
946	env = 0;	1125	y = env->y;
947	}
948	else if (map)
949	{
950	if (type == PLAYER)
951	{
952	--map->players;
953	map->touch ();
954	}
955		1126
956	map->dirty = true;	1127	// make sure cmov optimisation is applicable
957		1128	*(above ? &above->below : &env->inv) = below;
958	/* link the object above us */	1129	*(below ? &below->above : &above ) = above; // &above is just a dummy
959	if (above)
960	above->below = below;
961	else
962	map->at (x, y).top = below; /* we were top, set new top */
963
964	/* Relink the object below us, if there is one */
965	if (below)
966	below->above = above;
967	else
968	{
969	/* Nothing below, which means we need to relink map object for this space
970	* use translated coordinates in case some oddness with map tiling is
971	* evident
972	*/
973	if (GET_MAP_OB (map, x, y) != this)
974	{
975	char *dump = dump_object (this);
976	LOG (llevError,
977	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
978	free (dump);
979	dump = dump_object (GET_MAP_OB (map, x, y));
980	LOG (llevError, "%s\n", dump);
981	free (dump);
982	}
983
984	map->at (x, y).bot = above; /* goes on above it. */
985	}
986		1130
987	above = 0;	1131	above = 0;
988	below = 0;	1132	below = 0;
		1133	env = 0;
989		1134
990	if (map->in_memory == MAP_SAVING)	1135	if (pl && pl->is_player ())
991	return;	1136	{
		1137	if (ecb_expect_false (pl->contr->combat_ob == this))
		1138	{
		1139	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1140	pl->contr->combat_ob = 0;
		1141	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1142	}
		1143
		1144	if (ecb_expect_false (pl->contr->ranged_ob == this))
		1145	{
		1146	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1147	pl->contr->ranged_ob = 0;
		1148	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1149	}
		1150
		1151	pl->contr->queue_stats_update ();
		1152
		1153	if (ecb_expect_false (glow_radius) && pl->is_on_map ())
		1154	update_all_los (pl->map, pl->x, pl->y);
		1155	}
		1156	}
		1157	else if (map)
		1158	{
		1159	map->dirty = true;
		1160	mapspace &ms = this->ms ();
		1161
		1162	if (object *pl = ms.player ())
		1163	{
		1164	if (is_player ())
		1165	{
		1166	if (!flag [FLAG_WIZPASS])
		1167	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1168
		1169	// leaving a spot always closes any open container on the ground
		1170	if (container && !container->env)
		1171	// this causes spurious floorbox updates, but it ensures
		1172	// that the CLOSE event is being sent.
		1173	close_container ();
		1174
		1175	--map->players;
		1176	map->touch ();
		1177	}
		1178	else if (pl->container_ () == this)
		1179	{
		1180	// removing a container should close it
		1181	close_container ();
		1182	}
		1183	else
		1184	esrv_del_item (pl->contr, count);
		1185	}
		1186
		1187	/* link the object above us */
		1188	// re-link, make sure compiler can easily use cmove
		1189	*(above ? &above->below : &ms.top) = below;
		1190	*(below ? &below->above : &ms.bot) = above;
		1191
		1192	above = 0;
		1193	below = 0;
		1194
		1195	ms.invalidate ();
992		1196
993	int check_walk_off = !flag [FLAG_NO_APPLY];	1197	int check_walk_off = !flag [FLAG_NO_APPLY];
994		1198
995	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1199	if (object *pl = ms.player ())
996	{	1200	{
997	/* No point updating the players look faces if he is the object	1201	if (pl->container_ () == this)
998	* being removed.
999	*/
1000
1001	if (tmp->type == PLAYER && tmp != this)
1002	{
1003	/* If a container that the player is currently using somehow gets	1202	/* If a container that the player is currently using somehow gets
1004	* removed (most likely destroyed), update the player view	1203	* removed (most likely destroyed), update the player view
1005	* appropriately.	1204	* appropriately.
1006	*/	1205	*/
1007	if (tmp->container == this)	1206	pl->close_container ();
1008	{
1009	flag [FLAG_APPLIED] = 0;
1010	tmp->container = 0;
1011	}
1012		1207
		1208	//TODO: the floorbox prev/next might need updating
		1209	//esrv_del_item (pl->contr, count);
		1210	//TODO: update floorbox to preserve ordering
1013	if (tmp->contr->ns)	1211	if (pl->contr->ns)
1014	tmp->contr->ns->floorbox_update ();	1212	pl->contr->ns->floorbox_update ();
		1213	}
		1214
		1215	if (check_walk_off)
		1216	for (object *above, *tmp = ms.bot; tmp; tmp = above)
		1217	{
		1218	above = tmp->above;
		1219
		1220	/* No point updating the players look faces if he is the object
		1221	* being removed.
1015	}	1222	*/
1016		1223
1017	/* See if object moving off should effect something */	1224	/* See if object moving off should effect something */
1018	if (check_walk_off
1019	&& ((move_type & tmp->move_off)	1225	if ((move_type & tmp->move_off)
1020	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1226	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1021	{
1022	move_apply (tmp, this, 0);	1227	move_apply (tmp, this, 0);
1023
1024	if (destroyed ())
1025	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1026	}	1228	}
1027		1229
1028	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1230	if (affects_los ())
1029	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1030	if (tmp->above == tmp)
1031	tmp->above = 0;
1032
1033	last = tmp;
1034	}
1035
1036	/* last == NULL if there are no objects on this space */
1037	//TODO: this makes little sense, why only update the topmost object?
1038	if (!last)
1039	map->at (x, y).flags_ = 0;
1040	else
1041	update_object (last, UP_OBJ_REMOVE);
1042
1043	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1044	update_all_los (map, x, y);	1231	update_all_los (map, x, y);
1045	}	1232	}
1046	}	1233	}
1047		1234
1048	/*	1235	/*
…		…
1057	merge_ob (object *op, object *top)	1244	merge_ob (object *op, object *top)
1058	{	1245	{
1059	if (!op->nrof)	1246	if (!op->nrof)
1060	return 0;	1247	return 0;
1061		1248
1062	if (top)	1249	if (!top)
1063	for (top = op; top && top->above; top = top->above)	1250	for (top = op; top && top->above; top = top->above)
1064	;	1251	;
1065		1252
1066	for (; top; top = top->below)	1253	for (; top; top = top->below)
1067	{
1068	if (top == op)
1069	continue;
1070
1071	if (object::can_merge (op, top))	1254	if (object::can_merge (op, top))
1072	{	1255	{
1073	top->nrof += op->nrof;	1256	top->nrof += op->nrof;
1074		1257
1075	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1258	if (object *pl = top->visible_to ())
1076	op->weight = 0; /* Don't want any adjustements now */	1259	esrv_update_item (UPD_NROF, pl, top);
		1260
		1261	op->weight = 0; // cancel the addition above
		1262	op->carrying = 0; // must be 0 already
		1263
1077	op->destroy ();	1264	op->destroy ();
		1265
1078	return top;	1266	return top;
1079	}	1267	}
1080	}
1081		1268
1082	return 0;	1269	return 0;
1083	}	1270	}
1084		1271
		1272	void
		1273	object::expand_tail ()
		1274	{
		1275	if (more)
		1276	return;
		1277
		1278	object *prev = this;
		1279
		1280	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1281	{
		1282	object *op = at->instance ();
		1283
		1284	op->name = name;
		1285	op->name_pl = name_pl;
		1286	op->title = title;
		1287
		1288	op->head = this;
		1289	prev->more = op;
		1290
		1291	prev = op;
		1292	}
		1293	}
		1294
1085	/*	1295	/*
1086	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1296	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1087	* job preparing multi-part monsters	1297	* job preparing multi-part monsters.
1088	*/	1298	*/
1089	object *	1299	object *
1090	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1300	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1091	{	1301	{
		1302	op->remove ();
		1303
1092	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1304	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1093	{	1305	{
1094	tmp->x = x + tmp->arch->clone.x;	1306	tmp->x = x + tmp->arch->x;
1095	tmp->y = y + tmp->arch->clone.y;	1307	tmp->y = y + tmp->arch->y;
1096	}	1308	}
1097		1309
1098	return insert_ob_in_map (op, m, originator, flag);	1310	return insert_ob_in_map (op, m, originator, flag);
1099	}	1311	}
1100		1312
…		…
1113	* Passing 0 for flag gives proper default values, so flag really only needs	1325	* Passing 0 for flag gives proper default values, so flag really only needs
1114	* to be set if special handling is needed.	1326	* to be set if special handling is needed.
1115	*	1327	*
1116	* Return value:	1328	* Return value:
1117	* new object if 'op' was merged with other object	1329	* new object if 'op' was merged with other object
1118	* NULL if 'op' was destroyed	1330	* NULL if there was an error (destroyed, blocked etc.)
1119	* just 'op' otherwise	1331	* just 'op' otherwise
1120	*/	1332	*/
1121	object *	1333	object *
1122	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1334	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1123	{	1335	{
1124	object *tmp, *top, *floor = NULL;	1336	op->remove ();
1125	sint16 x, y;
1126		1337
1127	if (QUERY_FLAG (op, FLAG_FREED))	1338	if (m == &freed_map)//D TODO: remove soon
1128	{	1339	{//D
1129	LOG (llevError, "Trying to insert freed object!\n");	1340	LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1130	return NULL;
1131	}	1341	}//D
1132
1133	if (!m)
1134	{
1135	char *dump = dump_object (op);
1136	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1137	free (dump);
1138	return op;
1139	}
1140
1141	if (out_of_map (m, op->x, op->y))
1142	{
1143	char *dump = dump_object (op);
1144	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1145	#ifdef MANY_CORES
1146	/* Better to catch this here, as otherwise the next use of this object
1147	* is likely to cause a crash. Better to find out where it is getting
1148	* improperly inserted.
1149	*/
1150	abort ();
1151	#endif
1152	free (dump);
1153	return op;
1154	}
1155
1156	if (!QUERY_FLAG (op, FLAG_REMOVED))
1157	{
1158	char *dump = dump_object (op);
1159	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1160	free (dump);
1161	return op;
1162	}
1163
1164	if (op->more)
1165	{
1166	/* The part may be on a different map. */
1167
1168	object *more = op->more;
1169
1170	/* We really need the caller to normalise coordinates - if
1171	* we set the map, that doesn't work if the location is within
1172	* a map and this is straddling an edge. So only if coordinate
1173	* is clear wrong do we normalise it.
1174	*/
1175	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1176	more->map = get_map_from_coord (m, &more->x, &more->y);
1177	else if (!more->map)
1178	{
1179	/* For backwards compatibility - when not dealing with tiled maps,
1180	* more->map should always point to the parent.
1181	*/
1182	more->map = m;
1183	}
1184
1185	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1186	{
1187	if (!op->head)
1188	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1189
1190	return 0;
1191	}
1192	}
1193
1194	CLEAR_FLAG (op, FLAG_REMOVED);
1195		1342
1196	/* Ideally, the caller figures this out. However, it complicates a lot	1343	/* Ideally, the caller figures this out. However, it complicates a lot
1197	* of areas of callers (eg, anything that uses find_free_spot would now	1344	* of areas of callers (eg, anything that uses find_free_spot would now
1198	* need extra work	1345	* need extra work
1199	*/	1346	*/
1200	op->map = get_map_from_coord (m, &op->x, &op->y);	1347	maptile *newmap = m;
1201	x = op->x;	1348	if (!xy_normalise (newmap, op->x, op->y))
1202	y = op->y;	1349	{
		1350	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
		1351	return 0;
		1352	}
		1353
		1354	if (object *more = op->more)
		1355	if (!insert_ob_in_map (more, m, originator, flag))
		1356	return 0;
		1357
		1358	op->flag [FLAG_REMOVED] = false;
		1359	op->env = 0;
		1360	op->map = newmap;
		1361
		1362	mapspace &ms = op->ms ();
1203		1363
1204	/* this has to be done after we translate the coordinates.	1364	/* this has to be done after we translate the coordinates.
1205	*/	1365	*/
1206	if (op->nrof && !(flag & INS_NO_MERGE))	1366	if (op->nrof && !(flag & INS_NO_MERGE))
1207	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1367	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1208	if (object::can_merge (op, tmp))	1368	if (object::can_merge (op, tmp))
1209	{	1369	{
		1370	// TODO: we actually want to update tmp, not op,
		1371	// but some caller surely breaks when we return tmp
		1372	// from here :/
1210	op->nrof += tmp->nrof;	1373	op->nrof += tmp->nrof;
1211	tmp->destroy ();	1374	tmp->destroy ();
1212	}	1375	}
1213		1376
1214	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1377	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1215	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1378	op->clr_flag (FLAG_INV_LOCKED);
1216		1379
1217	if (!QUERY_FLAG (op, FLAG_ALIVE))	1380	if (!op->flag [FLAG_ALIVE])
1218	CLEAR_FLAG (op, FLAG_NO_STEAL);	1381	op->clr_flag (FLAG_NO_STEAL);
1219		1382
1220	if (flag & INS_BELOW_ORIGINATOR)	1383	if (flag & INS_BELOW_ORIGINATOR)
1221	{	1384	{
1222	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1385	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1223	{	1386	{
1224	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1387	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1225	abort ();	1388	abort ();
1226	}	1389	}
1227		1390
		1391	if (!originator->is_on_map ())
		1392	{
		1393	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1394	op->debug_desc (), originator->debug_desc ());
		1395	abort ();
		1396	}
		1397
1228	op->above = originator;	1398	op->above = originator;
1229	op->below = originator->below;	1399	op->below = originator->below;
1230
1231	if (op->below)
1232	op->below->above = op;
1233	else
1234	op->ms ().bot = op;
1235
1236	/* since *below* originator, no need to update top */
1237	originator->below = op;	1400	originator->below = op;
		1401
		1402	*(op->below ? &op->below->above : &ms.bot) = op;
1238	}	1403	}
1239	else	1404	else
1240	{	1405	{
		1406	object *floor = 0;
		1407	object *top = ms.top;
		1408
1241	/* If there are other objects, then */	1409	/* If there are other objects, then */
1242	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1410	if (top)
1243	{	1411	{
1244	object *last = 0;
1245
1246	/*	1412	/*
1247	* If there are multiple objects on this space, we do some trickier handling.	1413	* If there are multiple objects on this space, we do some trickier handling.
1248	* We've already dealt with merging if appropriate.	1414	* We've already dealt with merging if appropriate.
1249	* Generally, we want to put the new object on top. But if	1415	* Generally, we want to put the new object on top. But if
1250	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1416	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1251	* floor, we want to insert above that and no further.	1417	* floor, we want to insert above that and no further.
1252	* Also, if there are spell objects on this space, we stop processing	1418	* Also, if there are spell objects on this space, we stop processing
1253	* once we get to them. This reduces the need to traverse over all of	1419	* once we get to them. This reduces the need to traverse over all of
1254	* them when adding another one - this saves quite a bit of cpu time	1420	* them when adding another one - this saves quite a bit of cpu time
1255	* when lots of spells are cast in one area. Currently, it is presumed	1421	* when lots of spells are cast in one area. Currently, it is presumed
1256	* that flying non pickable objects are spell objects.	1422	* that flying non pickable objects are spell objects.
1257	*/	1423	*/
1258	while (top)	1424	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1259	{	1425	{
1260	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1426	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1261	floor = top;	1427	floor = tmp;
1262		1428
1263	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1429	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1264	{	1430	{
1265	/* We insert above top, so we want this object below this */	1431	/* We insert above top, so we want this object below this */
1266	top = top->below;	1432	top = tmp->below;
1267	break;	1433	break;
1268	}	1434	}
1269		1435
1270	last = top;
1271	top = top->above;	1436	top = tmp;
1272	}	1437	}
1273
1274	/* Don't want top to be NULL, so set it to the last valid object */
1275	top = last;
1276		1438
1277	/* We let update_position deal with figuring out what the space	1439	/* We let update_position deal with figuring out what the space
1278	* looks like instead of lots of conditions here.	1440	* looks like instead of lots of conditions here.
1279	* makes things faster, and effectively the same result.	1441	* makes things faster, and effectively the same result.
1280	*/	1442	*/
1281		1443
1282	/* Have object 'fall below' other objects that block view.	1444	/* Have object 'fall below' other objects that block view.
1283	* Unless those objects are exits, type 66	1445	* Unless those objects are exits.
1284	* If INS_ON_TOP is used, don't do this processing	1446	* If INS_ON_TOP is used, don't do this processing
1285	* Need to find the object that in fact blocks view, otherwise	1447	* Need to find the object that in fact blocks view, otherwise
1286	* stacking is a bit odd.	1448	* stacking is a bit odd.
1287	*/	1449	*/
1288	if (!(flag & INS_ON_TOP) &&	1450	if (!(flag & INS_ON_TOP)
1289	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1451	&& ms.flags () & P_BLOCKSVIEW
		1452	&& (op->face && !faces [op->face].visibility))
1290	{	1453	{
		1454	object *last;
		1455
1291	for (last = top; last != floor; last = last->below)	1456	for (last = top; last != floor; last = last->below)
1292	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1457	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1293	break;	1458	break;
		1459
1294	/* Check to see if we found the object that blocks view,	1460	/* Check to see if we found the object that blocks view,
1295	* and make sure we have a below pointer for it so that	1461	* and make sure we have a below pointer for it so that
1296	* we can get inserted below this one, which requires we	1462	* we can get inserted below this one, which requires we
1297	* set top to the object below us.	1463	* set top to the object below us.
1298	*/	1464	*/
1299	if (last && last->below && last != floor)	1465	if (last && last->below && last != floor)
1300	top = last->below;	1466	top = last->below;
1301	}	1467	}
1302	} /* If objects on this space */	1468	} /* If objects on this space */
1303		1469
1304	if (flag & INS_MAP_LOAD)
1305	top = GET_MAP_TOP (op->map, op->x, op->y);
1306
1307	if (flag & INS_ABOVE_FLOOR_ONLY)	1470	if (flag & INS_ABOVE_FLOOR_ONLY)
1308	top = floor;	1471	top = floor;
1309		1472
1310	/* Top is the object that our object (op) is going to get inserted above.	1473	// insert object above top, or bottom-most if top = 0
1311	*/
1312
1313	/* First object on this space */
1314	if (!top)	1474	if (!top)
1315	{	1475	{
1316	op->above = GET_MAP_OB (op->map, op->x, op->y);
1317
1318	if (op->above)
1319	op->above->below = op;
1320
1321	op->below = 0;	1476	op->below = 0;
		1477	op->above = ms.bot;
1322	op->ms ().bot = op;	1478	ms.bot = op;
		1479
		1480	*(op->above ? &op->above->below : &ms.top) = op;
1323	}	1481	}
1324	else	1482	else
1325	{ /* get inserted into the stack above top */	1483	{
1326	op->above = top->above;	1484	op->above = top->above;
1327
1328	if (op->above)
1329	op->above->below = op;	1485	top->above = op;
1330		1486
1331	op->below = top;	1487	op->below = top;
1332	top->above = op;	1488	*(op->above ? &op->above->below : &ms.top) = op;
1333	}	1489	}
		1490	}
1334		1491
1335	if (!op->above)	1492	if (op->is_player ())
1336	op->ms ().top = op;
1337	} /* else not INS_BELOW_ORIGINATOR */
1338
1339	if (op->type == PLAYER)
1340	{	1493	{
1341	op->contr->do_los = 1;	1494	op->contr->do_los = 1;
1342	++op->map->players;	1495	++op->map->players;
1343	op->map->touch ();	1496	op->map->touch ();
1344	}	1497	}
1345		1498
1346	op->map->dirty = true;	1499	op->map->dirty = true;
1347		1500
1348	/* If we have a floor, we know the player, if any, will be above
1349	* it, so save a few ticks and start from there.
1350	*/
1351	if (!(flag & INS_MAP_LOAD))
1352	if (object *pl = op->ms ().player ())	1501	if (object *pl = ms.player ())
		1502	//TODO: the floorbox prev/next might need updating
		1503	//esrv_send_item (pl, op);
		1504	//TODO: update floorbox to preserve ordering
1353	if (pl->contr->ns)	1505	if (pl->contr->ns)
1354	pl->contr->ns->floorbox_update ();	1506	pl->contr->ns->floorbox_update ();
1355		1507
1356	/* If this object glows, it may affect lighting conditions that are	1508	/* If this object glows, it may affect lighting conditions that are
1357	* visible to others on this map. But update_all_los is really	1509	* visible to others on this map. But update_all_los is really
1358	* an inefficient way to do this, as it means los for all players	1510	* an inefficient way to do this, as it means los for all players
1359	* on the map will get recalculated. The players could very well	1511	* on the map will get recalculated. The players could very well
1360	* be far away from this change and not affected in any way -	1512	* be far away from this change and not affected in any way -
1361	* this should get redone to only look for players within range,	1513	* this should get redone to only look for players within range,
1362	* or just updating the P_UPTODATE for spaces within this area	1514	* or just updating the P_UPTODATE for spaces within this area
1363	* of effect may be sufficient.	1515	* of effect may be sufficient.
1364	*/	1516	*/
1365	if (op->map->darkness && (op->glow_radius != 0))	1517	if (op->affects_los ())
		1518	{
		1519	op->ms ().invalidate ();
1366	update_all_los (op->map, op->x, op->y);	1520	update_all_los (op->map, op->x, op->y);
		1521	}
1367		1522
1368	/* updates flags (blocked, alive, no magic, etc) for this map space */	1523	/* updates flags (blocked, alive, no magic, etc) for this map space */
1369	update_object (op, UP_OBJ_INSERT);	1524	update_object (op, UP_OBJ_INSERT);
1370		1525
1371	INVOKE_OBJECT (INSERT, op);	1526	INVOKE_OBJECT (INSERT, op);
…		…
1378	* blocked() and wall() work properly), and these flags are updated by	1533	* blocked() and wall() work properly), and these flags are updated by
1379	* update_object().	1534	* update_object().
1380	*/	1535	*/
1381		1536
1382	/* if this is not the head or flag has been passed, don't check walk on status */	1537	/* if this is not the head or flag has been passed, don't check walk on status */
1383	if (!(flag & INS_NO_WALK_ON) && !op->head)	1538	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1384	{	1539	{
1385	if (check_move_on (op, originator))	1540	if (check_move_on (op, originator, flag))
1386	return 0;	1541	return 0;
1387		1542
1388	/* If we are a multi part object, lets work our way through the check	1543	/* If we are a multi part object, let's work our way through the check
1389	* walk on's.	1544	* walk on's.
1390	*/	1545	*/
1391	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1546	for (object *tmp = op->more; tmp; tmp = tmp->more)
1392	if (check_move_on (tmp, originator))	1547	if (check_move_on (tmp, originator, flag))
1393	return 0;	1548	return 0;
1394	}	1549	}
1395		1550
1396	return op;	1551	return op;
1397	}	1552	}
1398		1553
1399	/* this function inserts an object in the map, but if it	1554	/* this function inserts an object in the map, but if it
1400	* finds an object of its own type, it'll remove that one first.	1555	* finds an object of its own type, it'll remove that one first.
1401	* op is the object to insert it under: supplies x and the map.	1556	* op is the object to insert it under: supplies x and the map.
1402	*/	1557	*/
1403	void	1558	void
1404	replace_insert_ob_in_map (const char *arch_string, object *op)	1559	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1405	{	1560	{
1406	object *tmp, *tmp1;
1407
1408	/* first search for itself and remove any old instances */	1561	/* first search for itself and remove any old instances */
1409		1562
1410	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1563	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1411	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1564	if (tmp->arch->archname == archname) /* same archetype */
1412	tmp->destroy ();	1565	tmp->destroy ();
1413		1566
1414	tmp1 = arch_to_object (archetype::find (arch_string));	1567	object *tmp = archetype::find (archname)->instance ();
1415		1568
1416	tmp1->x = op->x;	1569	tmp->x = op->x;
1417	tmp1->y = op->y;	1570	tmp->y = op->y;
		1571
1418	insert_ob_in_map (tmp1, op->map, op, 0);	1572	insert_ob_in_map (tmp, op->map, op, 0);
1419	}	1573	}
1420		1574
1421	object *	1575	object *
1422	object::insert_at (object *where, object *originator, int flags)	1576	object::insert_at (object *where, object *originator, int flags)
1423	{	1577	{
		1578	if (where->env)
		1579	return where->env->insert (this);
		1580	else
1424	where->map->insert (this, where->x, where->y, originator, flags);	1581	return where->map->insert (this, where->x, where->y, originator, flags);
1425	}	1582	}
1426		1583
1427	/*	1584	// check whether we can put this into the map, respect max_volume, max_items
1428	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1585	bool
1429	* is returned contains nr objects, and the remaining parts contains	1586	object::can_drop_at (maptile *m, int x, int y, object *originator)
1430	* the rest (or is removed and freed if that number is 0).
1431	* On failure, NULL is returned, and the reason put into the
1432	* global static errmsg array.
1433	*/
1434	object *
1435	get_split_ob (object *orig_ob, uint32 nr)
1436	{	1587	{
1437	object *newob;	1588	mapspace &ms = m->at (x, y);
1438	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1439		1589
1440	if (orig_ob->nrof < nr)	1590	int items = ms.items ();
1441	{
1442	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1443	return NULL;
1444	}
1445		1591
1446	newob = object_create_clone (orig_ob);	1592	if (!items // testing !items ensures we can drop at least one item
		1593	|| (items < m->max_items
		1594	&& ms.volume () < m->max_volume))
		1595	return true;
1447		1596
1448	if ((orig_ob->nrof -= nr) < 1)	1597	if (originator)
1449	orig_ob->destroy (1);	1598	originator->failmsgf (
1450	else if (!is_removed)	1599	"No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
1451	{	1600	query_name ()
1452	if (orig_ob->env != NULL)	1601	);
1453	sub_weight (orig_ob->env, orig_ob->weight * nr);
1454	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1455	{
1456	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1457	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1458	return NULL;
1459	}
1460	}
1461		1602
1462	newob->nrof = nr;	1603	return false;
1463
1464	return newob;
1465	}	1604	}
1466		1605
1467	/*	1606	/*
1468	* decrease_ob_nr(object, number) decreases a specified number from	1607	* decrease(object, number) decreases a specified number from
1469	* the amount of an object. If the amount reaches 0, the object	1608	* the amount of an object. If the amount reaches 0, the object
1470	* is subsequently removed and freed.	1609	* is subsequently removed and freed.
1471	*	1610	*
1472	* Return value: 'op' if something is left, NULL if the amount reached 0	1611	* Return value: 'op' if something is left, NULL if the amount reached 0
1473	*/	1612	*/
		1613	bool
		1614	object::decrease (sint32 nr)
		1615	{
		1616	if (!nr)
		1617	return true;
1474		1618
		1619	nr = min (nr, nrof);
		1620
		1621	if (nrof > nr)
		1622	{
		1623	weight_t oweight = total_weight ();
		1624
		1625	nrof -= nr;
		1626
		1627	if (object *pl = visible_to ())
		1628	esrv_update_item (UPD_NROF, pl, this);
		1629
		1630	adjust_weight (env, oweight, total_weight ());
		1631
		1632	return true;
		1633	}
		1634	else
		1635	{
		1636	destroy ();
		1637	return false;
		1638	}
		1639	}
		1640
		1641	/*
		1642	* split(ob,nr) splits up ob into two parts. The part which
		1643	* is returned contains nr objects, and the remaining parts contains
		1644	* the rest (or is removed and returned if that number is 0).
		1645	* On failure, NULL is returned.
		1646	*/
1475	object *	1647	object *
1476	decrease_ob_nr (object *op, uint32 i)	1648	object::split (sint32 nr)
1477	{	1649	{
1478	object *tmp;	1650	int have = number_of ();
1479		1651
1480	if (i == 0) /* objects with op->nrof require this check */	1652	if (have < nr)
1481	return op;	1653	return 0;
1482		1654	else if (have == nr)
1483	if (i > op->nrof)
1484	i = op->nrof;
1485
1486	if (QUERY_FLAG (op, FLAG_REMOVED))
1487	op->nrof -= i;
1488	else if (op->env)
1489	{	1655	{
1490	/* is this object in the players inventory, or sub container
1491	* therein?
1492	*/
1493	tmp = op->in_player ();
1494	/* nope. Is this a container the player has opened?
1495	* If so, set tmp to that player.
1496	* IMO, searching through all the players will mostly
1497	* likely be quicker than following op->env to the map,
1498	* and then searching the map for a player.
1499	*/
1500	if (!tmp)
1501	for_all_players (pl)
1502	if (pl->ob->container == op->env)
1503	{
1504	tmp = pl->ob;
1505	break;
1506	}
1507
1508	if (i < op->nrof)
1509	{
1510	sub_weight (op->env, op->weight * i);
1511	op->nrof -= i;
1512	if (tmp)
1513	esrv_send_item (tmp, op);
1514	}
1515	else
1516	{
1517	op->remove ();	1656	remove ();
1518	op->nrof = 0;	1657	return this;
1519	if (tmp)
1520	esrv_del_item (tmp->contr, op->count);
1521	}
1522	}	1658	}
1523	else	1659	else
1524	{	1660	{
1525	object *above = op->above;	1661	decrease (nr);
1526		1662
1527	if (i < op->nrof)	1663	object *op = deep_clone ();
1528	op->nrof -= i;	1664	op->nrof = nr;
1529	else
1530	{
1531	op->remove ();
1532	op->nrof = 0;
1533	}
1534
1535	/* Since we just removed op, op->above is null */
1536	for (tmp = above; tmp; tmp = tmp->above)
1537	if (tmp->type == PLAYER)
1538	{
1539	if (op->nrof)
1540	esrv_send_item (tmp, op);
1541	else
1542	esrv_del_item (tmp->contr, op->count);
1543	}
1544	}
1545
1546	if (op->nrof)
1547	return op;	1665	return op;
1548	else
1549	{
1550	op->destroy ();
1551	return 0;
1552	}
1553	}
1554
1555	/*
1556	* add_weight(object, weight) adds the specified weight to an object,
1557	* and also updates how much the environment(s) is/are carrying.
1558	*/
1559
1560	void
1561	add_weight (object *op, signed long weight)
1562	{
1563	while (op != NULL)
1564	{
1565	if (op->type == CONTAINER)
1566	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1567
1568	op->carrying += weight;
1569	op = op->env;
1570	}	1666	}
1571	}	1667	}
1572		1668
1573	object *	1669	object *
1574	insert_ob_in_ob (object *op, object *where)	1670	insert_ob_in_ob (object *op, object *where)
…		…
1579	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1675	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1580	free (dump);	1676	free (dump);
1581	return op;	1677	return op;
1582	}	1678	}
1583		1679
1584	if (where->head)	1680	if (where->head_ () != where)
1585	{	1681	{
1586	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1682	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1587	where = where->head;	1683	where = where->head;
1588	}	1684	}
1589		1685
1590	return where->insert (op);	1686	return where->insert (op);
1591	}	1687	}
…		…
1593	/*	1689	/*
1594	* env->insert (op)	1690	* env->insert (op)
1595	* This function inserts the object op in the linked list	1691	* This function inserts the object op in the linked list
1596	* inside the object environment.	1692	* inside the object environment.
1597	*	1693	*
1598	* The function returns now pointer to inserted item, and return value can	1694	* The function returns now pointer to inserted item, and return value can
1599	* be != op, if items are merged. -Tero	1695	* be != op, if items are merged. -Tero
1600	*/	1696	*/
1601
1602	object *	1697	object *
1603	object::insert (object *op)	1698	object::insert (object *op)
1604	{	1699	{
1605	object *tmp, *otmp;
1606
1607	if (!QUERY_FLAG (op, FLAG_REMOVED))
1608	op->remove ();
1609
1610	if (op->more)	1700	if (op->more)
1611	{	1701	{
1612	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1702	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1613	return op;	1703	return op;
1614	}	1704	}
1615		1705
1616	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1706	op->remove ();
1617	CLEAR_FLAG (op, FLAG_REMOVED);	1707
		1708	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1709
1618	if (op->nrof)	1710	if (op->nrof)
1619	{
1620	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1711	for (object *tmp = inv; tmp; tmp = tmp->below)
1621	if (object::can_merge (tmp, op))	1712	if (object::can_merge (tmp, op))
1622	{	1713	{
1623	/* return the original object and remove inserted object	1714	/* return the original object and remove inserted object
1624	(client needs the original object) */	1715	(client prefers the original object) */
		1716
		1717	// carrying must be 0 for mergable objects
		1718	weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
		1719
1625	tmp->nrof += op->nrof;	1720	tmp->nrof += op->nrof;
1626	/* Weight handling gets pretty funky. Since we are adding to	1721
1627	* tmp->nrof, we need to increase the weight.	1722	if (object *pl = tmp->visible_to ())
1628	*/	1723	esrv_update_item (UPD_NROF, pl, tmp);
		1724
1629	add_weight (this, op->weight * op->nrof);	1725	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1630	SET_FLAG (op, FLAG_REMOVED);	1726
1631	op->destroy (); /* free the inserted object */	1727	op->destroy ();
1632	op = tmp;	1728	op = tmp;
1633	op->remove (); /* and fix old object's links */	1729	goto inserted;
1634	CLEAR_FLAG (op, FLAG_REMOVED);
1635	break;
1636	}	1730	}
1637		1731
1638	/* I assume combined objects have no inventory	1732	op->owner = 0; // it's his/hers now. period.
1639	* We add the weight - this object could have just been removed
1640	* (if it was possible to merge). calling remove_ob will subtract
1641	* the weight, so we need to add it in again, since we actually do
1642	* the linking below
1643	*/
1644	add_weight (this, op->weight * op->nrof);
1645	}
1646	else
1647	add_weight (this, (op->weight + op->carrying));
1648
1649	otmp = this->in_player ();
1650	if (otmp && otmp->contr)
1651	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1652	otmp->update_stats ();
1653
1654	op->map = 0;	1733	op->map = 0;
1655	op->env = this;	1734	op->x = 0;
		1735	op->y = 0;
		1736
1656	op->above = 0;	1737	op->above = 0;
1657	op->below = 0;	1738	op->below = inv;
1658	op->x = 0, op->y = 0;	1739	op->env = this;
1659		1740
		1741	if (inv)
		1742	inv->above = op;
		1743
		1744	inv = op;
		1745
		1746	op->flag [FLAG_REMOVED] = 0;
		1747
		1748	if (object *pl = op->visible_to ())
		1749	esrv_send_item (pl, op);
		1750
		1751	adjust_weight (this, 0, op->total_weight ());
		1752
		1753	inserted:
1660	/* reset the light list and los of the players on the map */	1754	/* reset the light list and los of the players on the map */
1661	if ((op->glow_radius != 0) && map)	1755	if (op->glow_radius && is_on_map ())
1662	{	1756	{
1663	#ifdef DEBUG_LIGHTS	1757	update_stats ();
1664	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1665	#endif /* DEBUG_LIGHTS */
1666	if (map->darkness)
1667	update_all_los (map, x, y);	1758	update_all_los (map, x, y);
1668	}
1669
1670	/* Client has no idea of ordering so lets not bother ordering it here.
1671	* It sure simplifies this function...
1672	*/
1673	if (!inv)
1674	inv = op;
1675	else
1676	{	1759	}
1677	op->below = inv;	1760	else if (is_player ())
1678	op->below->above = op;	1761	// if this is a player's inventory, update stats
1679	inv = op;	1762	contr->queue_stats_update ();
1680	}
1681		1763
1682	INVOKE_OBJECT (INSERT, this);	1764	INVOKE_OBJECT (INSERT, this);
1683		1765
1684	return op;	1766	return op;
1685	}	1767	}
…		…
1703	* MSW 2001-07-08: Check all objects on space, not just those below	1785	* MSW 2001-07-08: Check all objects on space, not just those below
1704	* object being inserted. insert_ob_in_map may not put new objects	1786	* object being inserted. insert_ob_in_map may not put new objects
1705	* on top.	1787	* on top.
1706	*/	1788	*/
1707	int	1789	int
1708	check_move_on (object *op, object *originator)	1790	check_move_on (object *op, object *originator, int flags)
1709	{	1791	{
		1792	if (op->flag [FLAG_NO_APPLY])
		1793	return 0;
		1794
1710	object *tmp;	1795	object *tmp;
1711	maptile *m = op->map;	1796	maptile *m = op->map;
1712	int x = op->x, y = op->y;	1797	int x = op->x, y = op->y;
1713		1798
1714	MoveType move_on, move_slow, move_block;	1799	mapspace &ms = m->at (x, y);
1715		1800
1716	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1801	ms.update ();
1717	return 0;
1718		1802
1719	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1803	MoveType move_on = ms.move_on;
1720	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1804	MoveType move_slow = ms.move_slow;
1721	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1805	MoveType move_block = ms.move_block;
1722		1806
1723	/* if nothing on this space will slow op down or be applied,	1807	/* if nothing on this space will slow op down or be applied,
1724	* no need to do checking below. have to make sure move_type	1808	* no need to do checking below. have to make sure move_type
1725	* is set, as lots of objects don't have it set - we treat that	1809	* is set, as lots of objects don't have it set - we treat that
1726	* as walking.	1810	* as walking.
…		…
1735	*/	1819	*/
1736	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)	1820	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1737	return 0;	1821	return 0;
1738		1822
1739	/* The objects have to be checked from top to bottom.	1823	/* The objects have to be checked from top to bottom.
1740	* Hence, we first go to the top:	1824	* Hence, we first go to the top:
1741	*/	1825	*/
1742		1826	for (object *next, *tmp = ms.top; tmp; tmp = next)
1743	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1744	{
1745	/* Trim the search when we find the first other spell effect
1746	* this helps performance so that if a space has 50 spell objects,
1747	* we don't need to check all of them.
1748	*/
1749	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1750	break;
1751	}	1827	{
		1828	next = tmp->below;
1752		1829
1753	for (; tmp; tmp = tmp->below)
1754	{
1755	if (tmp == op)	1830	if (tmp == op)
1756	continue; /* Can't apply yourself */	1831	continue; /* Can't apply yourself */
1757		1832
1758	/* Check to see if one of the movement types should be slowed down.	1833	/* Check to see if one of the movement types should be slowed down.
1759	* Second check makes sure that the movement types not being slowed	1834	* Second check makes sure that the movement types not being slowed
1760	* (~slow_move) is not blocked on this space - just because the	1835	* (~slow_move) is not blocked on this space - just because the
1761	* space doesn't slow down swimming (for example), if you can't actually	1836	* space doesn't slow down swimming (for example), if you can't actually
1762	* swim on that space, can't use it to avoid the penalty.	1837	* swim on that space, can't use it to avoid the penalty.
1763	*/	1838	*/
1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1839	if (!op->flag [FLAG_WIZPASS])
1765	{	1840	{
1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1841	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1842	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768	{	1843	{
1769
1770	float
1771	diff = tmp->move_slow_penalty * FABS (op->speed);	1844	float diff = tmp->move_slow_penalty * fabs (op->speed);
1772		1845
1773	if (op->type == PLAYER)	1846	if (op->is_player ())
1774	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1847	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1775	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1848	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1776	diff /= 4.0;	1849	diff /= 4.0;
1777		1850
1778	op->speed_left -= diff;	1851	op->speed_left -= diff;
1779	}	1852	}
1780	}	1853	}
1781		1854
1782	/* Basically same logic as above, except now for actual apply. */	1855	/* Basically same logic as above, except now for actual apply. */
1783	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1856	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1784	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1857	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1785	{	1858	{
		1859	if ((flags & INS_NO_AUTO_EXIT)
		1860	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1861	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1862	continue;
		1863
1786	move_apply (tmp, op, originator);	1864	move_apply (tmp, op, originator);
1787		1865
1788	if (op->destroyed ())	1866	if (op->destroyed ())
1789	return 1;	1867	return 1;
1790		1868
…		…
1813	LOG (llevError, "Present_arch called outside map.\n");	1891	LOG (llevError, "Present_arch called outside map.\n");
1814	return NULL;	1892	return NULL;
1815	}	1893	}
1816		1894
1817	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1895	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1818	if (tmp->arch == at)	1896	if (tmp->arch->archname == at->archname)
1819	return tmp;	1897	return tmp;
1820		1898
1821	return NULL;	1899	return NULL;
1822	}	1900	}
1823		1901
…		…
1887	* The first matching object is returned, or NULL if none.	1965	* The first matching object is returned, or NULL if none.
1888	*/	1966	*/
1889	object *	1967	object *
1890	present_arch_in_ob (const archetype *at, const object *op)	1968	present_arch_in_ob (const archetype *at, const object *op)
1891	{	1969	{
1892	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1970	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1893	if (tmp->arch == at)	1971	if (tmp->arch->archname == at->archname)
1894	return tmp;	1972	return tmp;
1895		1973
1896	return NULL;	1974	return NULL;
1897	}	1975	}
1898		1976
…		…
1900	* activate recursively a flag on an object inventory	1978	* activate recursively a flag on an object inventory
1901	*/	1979	*/
1902	void	1980	void
1903	flag_inv (object *op, int flag)	1981	flag_inv (object *op, int flag)
1904	{	1982	{
1905	if (op->inv)
1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1983	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1907	{	1984	{
1908	SET_FLAG (tmp, flag);	1985	tmp->set_flag (flag);
1909	flag_inv (tmp, flag);	1986	flag_inv (tmp, flag);
1910	}	1987	}
1911	}	1988	}
1912		1989
1913	/*	1990	/*
1914	* deactivate recursively a flag on an object inventory	1991	* deactivate recursively a flag on an object inventory
1915	*/	1992	*/
1916	void	1993	void
1917	unflag_inv (object *op, int flag)	1994	unflag_inv (object *op, int flag)
1918	{	1995	{
1919	if (op->inv)
1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1996	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1921	{	1997	{
1922	CLEAR_FLAG (tmp, flag);	1998	tmp->clr_flag (flag);
1923	unflag_inv (tmp, flag);	1999	unflag_inv (tmp, flag);
1924	}	2000	}
1925	}
1926
1927	/*
1928	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1929	* all it's inventory (recursively).
1930	* If checksums are used, a player will get set_cheat called for
1931	* him/her-self and all object carried by a call to this function.
1932	*/
1933	void
1934	set_cheat (object *op)
1935	{
1936	SET_FLAG (op, FLAG_WAS_WIZ);
1937	flag_inv (op, FLAG_WAS_WIZ);
1938	}	2001	}
1939		2002
1940	/*	2003	/*
1941	* find_free_spot(object, map, x, y, start, stop) will search for	2004	* find_free_spot(object, map, x, y, start, stop) will search for
1942	* a spot at the given map and coordinates which will be able to contain	2005	* a spot at the given map and coordinates which will be able to contain
…		…
1944	* to search (see the freearr_x/y[] definition).	2007	* to search (see the freearr_x/y[] definition).
1945	* It returns a random choice among the alternatives found.	2008	* It returns a random choice among the alternatives found.
1946	* start and stop are where to start relative to the free_arr array (1,9	2009	* start and stop are where to start relative to the free_arr array (1,9
1947	* does all 4 immediate directions). This returns the index into the	2010	* does all 4 immediate directions). This returns the index into the
1948	* array of the free spot, -1 if no spot available (dir 0 = x,y)	2011	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1949	* Note - this only checks to see if there is space for the head of the
1950	* object - if it is a multispace object, this should be called for all
1951	* pieces.
1952	* Note2: This function does correctly handle tiled maps, but does not	2012	* Note: This function does correctly handle tiled maps, but does not
1953	* inform the caller. However, insert_ob_in_map will update as	2013	* inform the caller. However, insert_ob_in_map will update as
1954	* necessary, so the caller shouldn't need to do any special work.	2014	* necessary, so the caller shouldn't need to do any special work.
1955	* Note - updated to take an object instead of archetype - this is necessary	2015	* Note - updated to take an object instead of archetype - this is necessary
1956	* because arch_blocked (now ob_blocked) needs to know the movement type	2016	* because arch_blocked (now ob_blocked) needs to know the movement type
1957	* to know if the space in question will block the object. We can't use	2017	* to know if the space in question will block the object. We can't use
1958	* the archetype because that isn't correct if the monster has been	2018	* the archetype because that isn't correct if the monster has been
1959	* customized, changed states, etc.	2019	* customized, changed states, etc.
1960	*/	2020	*/
1961	int	2021	int
1962	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2022	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1963	{	2023	{
1964	int index = 0, flag;
1965	int altern[SIZEOFFREE];	2024	int altern[SIZEOFFREE];
		2025	int index = 0;
1966		2026
1967	for (int i = start; i < stop; i++)	2027	for (int i = start; i < stop; i++)
1968	{	2028	{
1969	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2029	mapxy pos (m, x, y); pos.move (i);
1970	if (!flag)	2030
		2031	if (!pos.normalise ())
		2032	continue;
		2033
		2034	mapspace &ms = *pos;
		2035
		2036	if (ms.flags () & P_IS_ALIVE)
		2037	continue;
		2038
		2039	/* However, often
		2040	* ob doesn't have any move type (when used to place exits)
		2041	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2042	*/
		2043	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2044	{
1971	altern [index++] = i;	2045	altern [index++] = i;
		2046	continue;
		2047	}
1972		2048
1973	/* Basically, if we find a wall on a space, we cut down the search size.	2049	/* Basically, if we find a wall on a space, we cut down the search size.
1974	* In this way, we won't return spaces that are on another side of a wall.	2050	* In this way, we won't return spaces that are on another side of a wall.
1975	* This mostly work, but it cuts down the search size in all directions -	2051	* This mostly work, but it cuts down the search size in all directions -
1976	* if the space being examined only has a wall to the north and empty	2052	* if the space being examined only has a wall to the north and empty
1977	* spaces in all the other directions, this will reduce the search space	2053	* spaces in all the other directions, this will reduce the search space
1978	* to only the spaces immediately surrounding the target area, and	2054	* to only the spaces immediately surrounding the target area, and
1979	* won't look 2 spaces south of the target space.	2055	* won't look 2 spaces south of the target space.
1980	*/	2056	*/
1981	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2057	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2058	{
1982	stop = maxfree[i];	2059	stop = maxfree[i];
		2060	continue;
		2061	}
		2062
		2063	/* Note it is intentional that we check ob - the movement type of the
		2064	* head of the object should correspond for the entire object.
		2065	*/
		2066	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2067	continue;
		2068
		2069	if (ob->blocked (pos.m, pos.x, pos.y))
		2070	continue;
		2071
		2072	altern [index++] = i;
1983	}	2073	}
1984		2074
1985	if (!index)	2075	if (!index)
1986	return -1;	2076	return -1;
1987		2077
1988	return altern[RANDOM () % index];	2078	return altern [rndm (index)];
1989	}	2079	}
1990		2080
1991	/*	2081	/*
1992	* find_first_free_spot(archetype, maptile, x, y) works like	2082	* find_first_free_spot(archetype, maptile, x, y) works like
1993	* find_free_spot(), but it will search max number of squares.	2083	* find_free_spot(), but it will search max number of squares.
…		…
1996	*/	2086	*/
1997	int	2087	int
1998	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2088	find_first_free_spot (const object *ob, maptile *m, int x, int y)
1999	{	2089	{
2000	for (int i = 0; i < SIZEOFFREE; i++)	2090	for (int i = 0; i < SIZEOFFREE; i++)
2001	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2091	if (!ob->blocked (m, x + DIRX (i), y + DIRY (i)))
2002	return i;	2092	return i;
2003		2093
2004	return -1;	2094	return -1;
2005	}	2095	}
2006		2096
…		…
2014	{	2104	{
2015	arr += begin;	2105	arr += begin;
2016	end -= begin;	2106	end -= begin;
2017		2107
2018	while (--end)	2108	while (--end)
2019	swap (arr [end], arr [RANDOM () % (end + 1)]);	2109	swap (arr [end], arr [rndm (end + 1)]);
2020	}	2110	}
2021		2111
2022	/* new function to make monster searching more efficient, and effective!	2112	/* new function to make monster searching more efficient, and effective!
2023	* This basically returns a randomized array (in the passed pointer) of	2113	* This basically returns a randomized array (in the passed pointer) of
2024	* the spaces to find monsters. In this way, it won't always look for	2114	* the spaces to find monsters. In this way, it won't always look for
2025	* monsters to the north first. However, the size of the array passed	2115	* monsters to the north first. However, the size of the array passed
2026	* covers all the spaces, so within that size, all the spaces within	2116	* covers all the spaces, so within that size, all the spaces within
2027	* the 3x3 area will be searched, just not in a predictable order.	2117	* the 3x3 area will be searched, just not in a predictable order.
…		…
2052	* there is capable of.	2142	* there is capable of.
2053	*/	2143	*/
2054	int	2144	int
2055	find_dir (maptile *m, int x, int y, object *exclude)	2145	find_dir (maptile *m, int x, int y, object *exclude)
2056	{	2146	{
2057	int i, max = SIZEOFFREE, mflags;	2147	int max = SIZEOFFREE;
2058
2059	sint16 nx, ny;
2060	object *tmp;
2061	maptile *mp;
2062
2063	MoveType blocked, move_type;	2148	MoveType move_type;
2064		2149
2065	if (exclude && exclude->head)	2150	if (exclude && exclude->head_ () != exclude)
2066	{	2151	{
2067	exclude = exclude->head;	2152	exclude = exclude->head;
2068	move_type = exclude->move_type;	2153	move_type = exclude->move_type;
2069	}	2154	}
2070	else	2155	else
2071	{	2156	{
2072	/* If we don't have anything, presume it can use all movement types. */	2157	/* If we don't have anything, presume it can use all movement types. */
2073	move_type = MOVE_ALL;	2158	move_type = MOVE_ALL;
2074	}	2159	}
2075		2160
2076	for (i = 1; i < max; i++)	2161	for (int i = 1; i < max; i++)
2077	{	2162	{
2078	mp = m;	2163	mapxy pos (m, x, y);
2079	nx = x + freearr_x[i];	2164	pos.move (i);
2080	ny = y + freearr_y[i];
2081		2165
2082	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2166	if (!pos.normalise ())
2083
2084	if (mflags & P_OUT_OF_MAP)
2085	max = maxfree[i];	2167	max = maxfree[i];
2086	else	2168	else
2087	{	2169	{
2088	mapspace &ms = mp->at (nx, ny);	2170	mapspace &ms = *pos;
2089		2171
2090	blocked = ms.move_block;
2091
2092	if ((move_type & blocked) == move_type)	2172	if ((move_type & ms.move_block) == move_type)
2093	max = maxfree[i];	2173	max = maxfree [i];
2094	else if (mflags & P_IS_ALIVE)	2174	else if (ms.flags () & P_IS_ALIVE)
2095	{	2175	{
2096	for (tmp = ms.bot; tmp; tmp = tmp->above)	2176	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2097	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2177	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2098	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2178	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2099	break;
2100
2101	if (tmp)
2102	return freedir[i];	2179	return freedir [i];
2103	}	2180	}
2104	}	2181	}
2105	}	2182	}
2106		2183
2107	return 0;	2184	return 0;
…		…
2116	{	2193	{
2117	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2194	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2118	}	2195	}
2119		2196
2120	/*	2197	/*
2121	* find_dir_2(delta-x,delta-y) will return a direction in which	2198	* find_dir_2(delta-x,delta-y) will return a direction value
2122	* an object which has subtracted the x and y coordinates of another	2199	* for running into direct [dx, dy].
2123	* object, needs to travel toward it.	2200	* (the opposite of crossfire's find_dir_2!)
2124	*/	2201	*/
2125	int	2202	int
2126	find_dir_2 (int x, int y)	2203	find_dir_2 (int x, int y)
2127	{	2204	{
		2205	#if 1 // new algorithm
		2206	// this works by putting x, y into 16 sectors, which
		2207	// are not equal sized, but are a better approximation
		2208	// then the old algorithm, and then using a mapping
		2209	// table to map it into a direction value.
		2210	// basically, it maps these comparisons to each bit
		2211	// bit #3: x < 0
		2212	// bit #2: y < 0
		2213	// bit #1: x > y
		2214	// bit #0: x > 2y
		2215
		2216	static const uint8 dir[16] = {
		2217	4, 5, 4, 3,
		2218	2, 1, 2, 3,
		2219	6, 5, 6, 7,
		2220	8, 1, 8, 7,
		2221	};
		2222	int sector = 0;
		2223
		2224	// this is a bit ugly, but more likely to result in branchless code
		2225	sector |= x < 0 ? 8 : 0;
		2226	x = x < 0 ? -x : x; // abs
		2227
		2228	sector |= y < 0 ? 4 : 0;
		2229	y = y < 0 ? -y : y; // abs
		2230
		2231	if (x > y)
		2232	{
		2233	sector |= 2;
		2234
		2235	if (x > y * 2)
		2236	sector |= 1;
		2237	}
		2238	else
		2239	{
		2240	if (y > x * 2)
		2241	sector |= 1;
		2242	else if (!y)
		2243	return 0; // x == 0 here
		2244	}
		2245
		2246	return dir [sector];
		2247	#else // old algorithm
2128	int q;	2248	int q;
2129		2249
2130	if (y)	2250	if (y)
2131	q = x * 100 / y;	2251	q = 128 * x / y;
2132	else if (x)	2252	else if (x)
2133	q = -300 * x;	2253	q = -512 * x; // to make it > 309
2134	else	2254	else
2135	return 0;	2255	return 0;
2136		2256
2137	if (y > 0)	2257	if (y > 0)
2138	{	2258	{
2139	if (q < -242)	2259	if (q < -309) return 7;
		2260	if (q < -52) return 6;
		2261	if (q < 52) return 5;
		2262	if (q < 309) return 4;
		2263
2140	return 3;	2264	return 3;
2141	if (q < -41)	2265	}
2142	return 2;	2266	else
2143	if (q < 41)	2267	{
2144	return 1;	2268	if (q < -309) return 3;
2145	if (q < 242)	2269	if (q < -52) return 2;
2146	return 8;	2270	if (q < 52) return 1;
		2271	if (q < 309) return 8;
		2272
2147	return 7;	2273	return 7;
2148	}	2274	}
2149		2275	#endif
2150	if (q < -242)
2151	return 7;
2152	if (q < -41)
2153	return 6;
2154	if (q < 41)
2155	return 5;
2156	if (q < 242)
2157	return 4;
2158
2159	return 3;
2160	}
2161
2162	/*
2163	* absdir(int): Returns a number between 1 and 8, which represent
2164	* the "absolute" direction of a number (it actually takes care of
2165	* "overflow" in previous calculations of a direction).
2166	*/
2167
2168	int
2169	absdir (int d)
2170	{
2171	while (d < 1)
2172	d += 8;
2173
2174	while (d > 8)
2175	d -= 8;
2176
2177	return d;
2178	}	2276	}
2179		2277
2180	/*	2278	/*
2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2279	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2182	* between two directions (which are expected to be absolute (see absdir())	2280	* between two directions (which are expected to be absolute (see absdir())
2183	*/	2281	*/
2184
2185	int	2282	int
2186	dirdiff (int dir1, int dir2)	2283	dirdiff (int dir1, int dir2)
2187	{	2284	{
2188	int d;
2189
2190	d = abs (dir1 - dir2);	2285	int d = abs (dir1 - dir2);
2191	if (d > 4)
2192	d = 8 - d;
2193		2286
2194	return d;	2287	return d > 4 ? 8 - d : d;
2195	}	2288	}
2196		2289
2197	/* peterm:	2290	/* peterm:
2198	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2291	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2199	* Basically, this is a table of directions, and what directions	2292	* Basically, this is a table of directions, and what directions
…		…
2201	* This basically means that if direction is 15, then it could either go	2294	* This basically means that if direction is 15, then it could either go
2202	* direction 4, 14, or 16 to get back to where we are.	2295	* direction 4, 14, or 16 to get back to where we are.
2203	* Moved from spell_util.c to object.c with the other related direction	2296	* Moved from spell_util.c to object.c with the other related direction
2204	* functions.	2297	* functions.
2205	*/	2298	*/
2206	int reduction_dir[SIZEOFFREE][3] = {	2299	static const int reduction_dir[SIZEOFFREE][3] = {
2207	{0, 0, 0}, /* 0 */	2300	{0, 0, 0}, /* 0 */
2208	{0, 0, 0}, /* 1 */	2301	{0, 0, 0}, /* 1 */
2209	{0, 0, 0}, /* 2 */	2302	{0, 0, 0}, /* 2 */
2210	{0, 0, 0}, /* 3 */	2303	{0, 0, 0}, /* 3 */
2211	{0, 0, 0}, /* 4 */	2304	{0, 0, 0}, /* 4 */
…		…
2268	int mflags;	2361	int mflags;
2269		2362
2270	if (dir < 0)	2363	if (dir < 0)
2271	return 0; /* exit condition: invalid direction */	2364	return 0; /* exit condition: invalid direction */
2272		2365
2273	dx = x + freearr_x[dir];	2366	dx = x + DIRX (dir);
2274	dy = y + freearr_y[dir];	2367	dy = y + DIRY (dir);
2275		2368
2276	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);	2369	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2277		2370
2278	/* This functional arguably was incorrect before - it was	2371	/* This functional arguably was incorrect before - it was
2279	* checking for P_WALL - that was basically seeing if	2372	* checking for P_WALL - that was basically seeing if
…		…
2302	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2395	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2303	* core dumps if they do.	2396	* core dumps if they do.
2304	*	2397	*
2305	* Add a check so we can't pick up invisible objects (0.93.8)	2398	* Add a check so we can't pick up invisible objects (0.93.8)
2306	*/	2399	*/
2307
2308	int	2400	int
2309	can_pick (const object *who, const object *item)	2401	can_pick (const object *who, const object *item)
2310	{	2402	{
2311	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2403	return /*who->flag [FLAG_WIZ]|| */
2312	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2404	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2313	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2405	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2314	}	2406	}
		2407
		2408	//-GPL
2315		2409
2316	/*	2410	/*
2317	* create clone from object to another	2411	* create clone from object to another
2318	*/	2412	*/
2319	object *	2413	object *
2320	object_create_clone (object *asrc)	2414	object::deep_clone ()
2321	{	2415	{
2322	object *dst = 0, *tmp, *src, *part, *prev, *item;	2416	assert (("deep_clone called on non-head object", is_head ()));
2323		2417
2324	if (!asrc)	2418	object *dst = clone ();
2325	return 0;
2326		2419
2327	src = asrc;	2420	object *prev = dst;
2328	if (src->head)
2329	src = src->head;
2330
2331	prev = 0;
2332	for (part = src; part; part = part->more)	2421	for (object *part = this->more; part; part = part->more)
2333	{	2422	{
2334	tmp = part->clone ();	2423	object *tmp = part->clone ();
2335	tmp->x -= src->x;
2336	tmp->y -= src->y;
2337
2338	if (!part->head)
2339	{
2340	dst = tmp;
2341	tmp->head = 0;
2342	}
2343	else
2344	tmp->head = dst;	2424	tmp->head = dst;
2345
2346	tmp->more = 0;
2347
2348	if (prev)
2349	prev->more = tmp;	2425	prev->more = tmp;
2350
2351	prev = tmp;	2426	prev = tmp;
2352	}	2427	}
2353		2428
2354	for (item = src->inv; item; item = item->below)	2429	for (object *item = inv; item; item = item->below)
2355	insert_ob_in_ob (object_create_clone (item), dst);	2430	insert_ob_in_ob (item->deep_clone (), dst);
2356		2431
2357	return dst;	2432	return dst;
2358	}
2359
2360	/* GROS - Creates an object using a string representing its content. */
2361	/* Basically, we save the content of the string to a temp file, then call */
2362	/* load_object on it. I admit it is a highly inefficient way to make things, */
2363	/* but it was simple to make and allows reusing the load_object function. */
2364	/* Remember not to use load_object_str in a time-critical situation. */
2365	/* Also remember that multiparts objects are not supported for now. */
2366	object *
2367	load_object_str (const char *obstr)
2368	{
2369	object *op;
2370	char filename[MAX_BUF];
2371
2372	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2373
2374	FILE *tempfile = fopen (filename, "w");
2375
2376	if (tempfile == NULL)
2377	{
2378	LOG (llevError, "Error - Unable to access load object temp file\n");
2379	return NULL;
2380	}
2381
2382	fprintf (tempfile, obstr);
2383	fclose (tempfile);
2384
2385	op = object::create ();
2386
2387	object_thawer thawer (filename);
2388
2389	if (thawer)
2390	load_object (thawer, op, 0);
2391
2392	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2393	CLEAR_FLAG (op, FLAG_REMOVED);
2394
2395	return op;
2396	}	2433	}
2397		2434
2398	/* This returns the first object in who's inventory that	2435	/* This returns the first object in who's inventory that
2399	* has the same type and subtype match.	2436	* has the same type and subtype match.
2400	* returns NULL if no match.	2437	* returns NULL if no match.
…		…
2407	return tmp;	2444	return tmp;
2408		2445
2409	return 0;	2446	return 0;
2410	}	2447	}
2411		2448
2412	/* If ob has a field named key, return the link from the list,	2449	/* Zero the key_values on op, decrementing the shared-string
2413	* otherwise return NULL.	2450	* refcounts and freeing the links.
2414	*	2451	*/
2415	* key must be a passed in shared string - otherwise, this won't	2452	void
2416	* do the desired thing.	2453	key_values::clear ()
2417	*/
2418	key_value *
2419	get_ob_key_link (const object *ob, const char *key)
2420	{	2454	{
2421	for (key_value *link = ob->key_values; link; link = link->next)	2455	for (key_value *kvp = first; kvp; )
		2456	{
		2457	key_value *next = kvp->next;
		2458	delete kvp;
		2459	kvp = next;
		2460	}
		2461
		2462	first = 0;
		2463	}
		2464
		2465	shstr_tmp
		2466	key_values::get (shstr_tmp key) const
		2467	{
		2468	for (key_value *kv = first; kv; kv = kv->next)
2422	if (link->key == key)	2469	if (kv->key == key)
2423	return link;
2424
2425	return 0;
2426	}
2427
2428	/*
2429	* Returns the value of op has an extra_field for key, or NULL.
2430	*
2431	* The argument doesn't need to be a shared string.
2432	*
2433	* The returned string is shared.
2434	*/
2435	const char *
2436	get_ob_key_value (const object *op, const char *const key)
2437	{
2438	key_value *link;
2439	shstr_cmp canonical_key (key);
2440
2441	if (!canonical_key)
2442	{
2443	/* 1. There being a field named key on any object
2444	* implies there'd be a shared string to find.
2445	* 2. Since there isn't, no object has this field.
2446	* 3. Therefore, *this* object doesn't have this field.
2447	*/
2448	return 0;
2449	}
2450
2451	/* This is copied from get_ob_key_link() above -
2452	* only 4 lines, and saves the function call overhead.
2453	*/
2454	for (link = op->key_values; link; link = link->next)
2455	if (link->key == canonical_key)
2456	return link->value;	2470	return kv->value;
2457		2471
2458	return 0;	2472	return shstr ();
2459	}	2473	}
2460		2474
2461		2475	void
2462	/*	2476	key_values::add (shstr_tmp key, shstr_tmp value)
2463	* Updates the canonical_key in op to value.
2464	*
2465	* canonical_key is a shared string (value doesn't have to be).
2466	*
2467	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2468	* keys.
2469	*
2470	* Returns TRUE on success.
2471	*/
2472	int
2473	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2474	{	2477	{
2475	key_value *field = NULL, *last = NULL;	2478	key_value *kv = new key_value;
2476		2479
2477	for (field = op->key_values; field != NULL; field = field->next)	2480	kv->next = first;
2478	{	2481	kv->key = key;
2479	if (field->key != canonical_key)	2482	kv->value = value;
		2483
		2484	first = kv;
		2485	}
		2486
		2487	void
		2488	key_values::set (shstr_tmp key, shstr_tmp value)
		2489	{
		2490	for (key_value *kv = first; kv; kv = kv->next)
		2491	if (kv->key == key)
2480	{	2492	{
2481	last = field;	2493	kv->value = value;
2482	continue;	2494	return;
2483	}	2495	}
2484		2496
2485	if (value)	2497	add (key, value);
2486	field->value = value;	2498	}
2487	else	2499
		2500	void
		2501	key_values::del (shstr_tmp key)
		2502	{
		2503	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
		2504	if ((*kvp)->key == key)
2488	{	2505	{
2489	/* Basically, if the archetype has this key set,	2506	key_value *kv = *kvp;
2490	* we need to store the null value so when we save	2507	*kvp = (*kvp)->next;
2491	* it, we save the empty value so that when we load,	2508	delete kv;
2492	* we get this value back again.	2509	return;
2493	*/
2494	if (get_ob_key_link (&op->arch->clone, canonical_key))
2495	field->value = 0;
2496	else
2497	{
2498	if (last)
2499	last->next = field->next;
2500	else
2501	op->key_values = field->next;
2502
2503	delete field;
2504	}
2505	}	2510	}
2506	return TRUE;	2511	}
		2512
		2513	void
		2514	key_values::reverse ()
		2515	{
		2516	key_value *prev = 0;
		2517	key_value *head = first;
		2518
		2519	while (head)
2507	}	2520	{
2508	/* IF we get here, key doesn't exist */	2521	key_value *node = head;
		2522	head = head->next;
		2523	node->next = prev;
		2524	prev = node;
		2525	}
2509		2526
2510	/* No field, we'll have to add it. */	2527	first = prev;
2511
2512	if (!add_key)
2513	return FALSE;
2514
2515	/* There isn't any good reason to store a null
2516	* value in the key/value list. If the archetype has
2517	* this key, then we should also have it, so shouldn't
2518	* be here. If user wants to store empty strings,
2519	* should pass in ""
2520	*/
2521	if (value == NULL)
2522	return TRUE;
2523
2524	field = new key_value;
2525
2526	field->key = canonical_key;
2527	field->value = value;
2528	/* Usual prepend-addition. */
2529	field->next = op->key_values;
2530	op->key_values = field;
2531
2532	return TRUE;
2533	}	2528	}
2534		2529
2535	/*	2530	key_values &
2536	* Updates the key in op to value.	2531	key_values::operator =(const key_values &kv)
2537	*
2538	* If add_key is FALSE, this will only update existing keys,
2539	* and not add new ones.
2540	* In general, should be little reason FALSE is ever passed in for add_key
2541	*
2542	* Returns TRUE on success.
2543	*/
2544	int
2545	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2546	{	2532	{
2547	shstr key_ (key);	2533	clear ();
2548		2534
2549	return set_ob_key_value_s (op, key_, value, add_key);	2535	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2536	add (kvp->key, kvp->value);
		2537
		2538	reverse ();
		2539
		2540	return *this;
2550	}	2541	}
2551		2542
2552	object::depth_iterator::depth_iterator (object *container)	2543	object::depth_iterator::depth_iterator (object *container)
2553	: iterator_base (container)	2544	: iterator_base (container)
2554	{	2545	{
…		…
2567	item = item->inv;	2558	item = item->inv;
2568	}	2559	}
2569	else	2560	else
2570	item = item->env;	2561	item = item->env;
2571	}	2562	}
2572
2573		2563
2574	const char *	2564	const char *
2575	object::flag_desc (char *desc, int len) const	2565	object::flag_desc (char *desc, int len) const
2576	{	2566	{
2577	char *p = desc;	2567	char *p = desc;
…		…
2605	{	2595	{
2606	char flagdesc[512];	2596	char flagdesc[512];
2607	char info2[256 * 4];	2597	char info2[256 * 4];
2608	char *p = info;	2598	char *p = info;
2609		2599
2610	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2600	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2611	count, uuid.seq,	2601	count,
		2602	uuid.c_str (),
2612	&name,	2603	&name,
2613	title ? "\",title:" : "",	2604	title ? ",title:\"" : "",
2614	title ? (const char *)title : "",	2605	title ? (const char *)title : "",
		2606	title ? "\"" : "",
2615	flag_desc (flagdesc, 512), type);	2607	flag_desc (flagdesc, 512), type);
2616		2608
2617	if (env)	2609	if (!flag[FLAG_REMOVED] && env)
2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619		2611
2620	if (map)	2612	if (map)
2621	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2622		2614
…		…
2624	}	2616	}
2625		2617
2626	const char *	2618	const char *
2627	object::debug_desc () const	2619	object::debug_desc () const
2628	{	2620	{
2629	static char info[256 * 4];	2621	static char info[3][256 * 4];
		2622	static int info_idx;
		2623
2630	return debug_desc (info);	2624	return debug_desc (info [++info_idx % 3]);
2631	}	2625	}
2632		2626
		2627	struct region *
		2628	object::region () const
		2629	{
		2630	return map ? map->region (x, y)
		2631	: region::default_region ();
		2632	}
		2633
		2634	//+GPL
		2635
		2636	void
		2637	object::open_container (object *new_container)
		2638	{
		2639	if (container == new_container)
		2640	return;
		2641
		2642	object *old_container = container;
		2643
		2644	if (old_container)
		2645	{
		2646	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2647	return;
		2648
		2649	#if 0
		2650	// remove the "Close old_container" object.
		2651	if (object *closer = old_container->inv)
		2652	if (closer->type == CLOSE_CON)
		2653	closer->destroy ();
		2654	#endif
		2655
		2656	// make sure the container is available
		2657	esrv_send_item (this, old_container);
		2658
		2659	old_container->flag [FLAG_APPLIED] = false;
		2660	container = 0;
		2661
		2662	// client needs item update to make it work, client bug requires this to be separate
		2663	esrv_update_item (UPD_FLAGS, this, old_container);
		2664
		2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
		2666	play_sound (sound_find ("chest_close"));
		2667	}
		2668
		2669	if (new_container)
		2670	{
		2671	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2672	return;
		2673
		2674	// TODO: this does not seem to serve any purpose anymore?
		2675	#if 0
		2676	// insert the "Close Container" object.
		2677	if (archetype *closer = new_container->other_arch)
		2678	{
		2679	object *closer = new_container->other_arch->instance ();
		2680	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2681	new_container->insert (closer);
		2682	}
		2683	#endif
		2684
		2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
		2686
		2687	// make sure the container is available, client bug requires this to be separate
		2688	esrv_send_item (this, new_container);
		2689
		2690	new_container->flag [FLAG_APPLIED] = true;
		2691	container = new_container;
		2692
		2693	// client needs flag change
		2694	esrv_update_item (UPD_FLAGS, this, new_container);
		2695	esrv_send_inventory (this, new_container);
		2696	play_sound (sound_find ("chest_open"));
		2697	}
		2698	// else if (!old_container->env && contr && contr->ns)
		2699	// contr->ns->floorbox_reset ();
		2700	}
		2701
		2702	//-GPL
		2703
		2704	// prefetch some flat area around the player
		2705	static void
		2706	prefetch_surrounding_area (object *op, maptile *map, int range)
		2707	{
		2708	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2709	op->x - range , op->y - range ,
		2710	op->x + range + 1, op->y + range + 1);
		2711	rect->m;
		2712	++rect)
		2713	{
		2714	rect->m->touch ();
		2715	rect->m->activate ();
		2716	}
		2717	}
		2718
		2719	// prefetch a generous area around the player, also up and down
		2720	void
		2721	object::prefetch_surrounding_maps ()
		2722	{
		2723	prefetch_surrounding_area (this, map, 40);
		2724
		2725	if (maptile *m = map->tile_available (TILE_DOWN))
		2726	prefetch_surrounding_area (this, m, 20);
		2727
		2728	if (maptile *m = map->tile_available (TILE_UP))
		2729	prefetch_surrounding_area (this, m, 20);
		2730	}
		2731
		2732	//+GPL
		2733
		2734	object *
		2735	object::force_find (shstr_tmp name)
		2736	{
		2737	/* cycle through his inventory to look for the MARK we want to
		2738	* place
		2739	*/
		2740	for (object *tmp = inv; tmp; tmp = tmp->below)
		2741	if (tmp->type == FORCE && tmp->slaying == name)
		2742	return splay (tmp);
		2743
		2744	return 0;
		2745	}
		2746
		2747	void
		2748	object::force_set_timer (int duration)
		2749	{
		2750	this->duration = 1;
		2751	this->speed_left = -1.f;
		2752
		2753	this->set_speed (duration ? 1.f / duration : 0.f);
		2754	}
		2755
		2756	object *
		2757	object::force_add (shstr_tmp name, int duration)
		2758	{
		2759	if (object *force = force_find (name))
		2760	force->destroy ();
		2761
		2762	object *force = archetype::get (FORCE_NAME);
		2763
		2764	force->slaying = name;
		2765	force->force_set_timer (duration);
		2766	force->flag [FLAG_APPLIED] = true;
		2767
		2768	return insert (force);
		2769	}
		2770
		2771	void
		2772	object::play_sound (faceidx sound) const
		2773	{
		2774	if (!sound)
		2775	return;
		2776
		2777	if (is_on_map ())
		2778	map->play_sound (sound, x, y);
		2779	else if (object *pl = in_player ())
		2780	pl->contr->play_sound (sound);
		2781	}
		2782
		2783	void
		2784	object::say_msg (const char *msg) const
		2785	{
		2786	if (is_on_map ())
		2787	map->say_msg (msg, x, y);
		2788	else if (object *pl = in_player ())
		2789	pl->contr->play_sound (sound);
		2790	}
		2791
		2792	void
		2793	object::make_noise ()
		2794	{
		2795	// we do not model noise in the map, so instead put
		2796	// a temporary light into the noise source
		2797	// could use the map instead, but that's less reliable for our
		2798	// goal, which is to make invisibility a bit harder to exploit
		2799
		2800	// currently only works sensibly for players
		2801	if (!is_player ())
		2802	return;
		2803
		2804	// find old force, or create new one
		2805	object *force = force_find (shstr_noise_force);
		2806
		2807	if (force)
		2808	force->speed_left = -1.f; // patch old speed up
		2809	else
		2810	{
		2811	force = archetype::get (shstr_noise_force);
		2812
		2813	force->slaying = shstr_noise_force;
		2814	force->stats.food = 1;
		2815	force->speed_left = -1.f;
		2816
		2817	force->set_speed (1.f / 4.f);
		2818	force->flag [FLAG_IS_USED_UP] = true;
		2819	force->flag [FLAG_APPLIED] = true;
		2820
		2821	insert (force);
		2822	}
		2823	}
		2824
		2825	void object::change_move_type (MoveType mt)
		2826	{
		2827	if (move_type == mt)
		2828	return;
		2829
		2830	if (is_on_map ())
		2831	{
		2832	// we are on the map, so handle move_on/off effects
		2833	remove ();
		2834	move_type = mt;
		2835	map->insert (this, x, y, this);
		2836	}
		2837	else
		2838	move_type = mt;
		2839	}
		2840
		2841	/* object should be a player.
		2842	* we return the object the player has marked with the 'mark' command
		2843	* below. If no match is found (or object has changed), we return
		2844	* NULL. We leave it up to the calling function to print messages if
		2845	* nothing is found.
		2846	*/
		2847	object *
		2848	object::mark () const
		2849	{
		2850	if (contr && contr->mark && contr->mark->env == this)
		2851	return contr->mark;
		2852	else
		2853	return 0;
		2854	}
		2855
		2856	// put marked object first in the inventory
		2857	// this is used by identify-like spells so players can influence
		2858	// the order a bit.
		2859	void
		2860	object::splay_marked ()
		2861	{
		2862	if (object *marked = mark ())
		2863	splay (marked);
		2864	}
		2865

Diff Legend

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