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.93 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.342 by sf-kernelpanic, Sun Apr 10 20:30:53 2011 UTC

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

Diff Legend

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