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

Diff Legend

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