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

Diff Legend

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