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

Diff Legend

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