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

Diff Legend

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