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.45 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.368 by root, Wed Dec 5 19:03:26 2018 UTC

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