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.202 by root, Thu Apr 10 15:35:15 2008 UTC vs.
Revision 1.325 by root, Wed Apr 14 21:36:31 2010 UTC

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

Diff Legend

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