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.200 by root, Sun Jan 13 08:55:41 2008 UTC vs.
Revision 1.333 by root, Thu Apr 22 03:53: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 + weight)
		451	- weight_adjust_for (op, op->carrying);
		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 carrying 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	: maptile (3, 3)
		1041	{
		1042	path = "<freed objects map>";
		1043	name = "/internal/freed_objects_map";
		1044	no_drop = 1;
		1045	no_reset = 1;
		1046
		1047	in_memory = MAP_ACTIVE;
		1048	}
		1049
		1050	~freed_map ()
		1051	{
		1052	destroy ();
		1053	}
		1054	} freed_map; // freed objects are moved here to avoid crashes
		1055
		1056	void
908	object::do_destroy ()	1057	object::do_destroy ()
909	{	1058	{
910	attachable::do_destroy ();
911
912	if (flag [FLAG_IS_LINKED])	1059	if (flag [FLAG_IS_LINKED])
913	remove_button_link (this);	1060	remove_link ();
914		1061
915	if (flag [FLAG_FRIENDLY])	1062	if (flag [FLAG_FRIENDLY])
916	remove_friendly_object (this);	1063	remove_friendly_object (this);
917		1064
918	if (!flag [FLAG_REMOVED])
919	remove ();	1065	remove ();
920		1066
921	destroy_inv (true);	1067	attachable::do_destroy ();
922		1068
923	deactivate ();	1069	deactivate ();
924	unlink ();	1070	unlink ();
925		1071
926	flag [FLAG_FREED] = 1;	1072	flag [FLAG_FREED] = 1;
927		1073
928	// hack to ensure that freed objects still have a valid map	1074	// 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
941	freed_map->alloc ();
942	freed_map->in_memory = MAP_IN_MEMORY;
943	}
944
945	map = freed_map;	1075	map = &freed_map;
946	x = 1;	1076	x = 1;
947	y = 1;	1077	y = 1;
948	}
949		1078
950	if (more)	1079	if (more)
951	{	1080	{
952	more->destroy ();	1081	more->destroy ();
953	more = 0;	1082	more = 0;
…		…
961	attacked_by = 0;	1090	attacked_by = 0;
962	current_weapon = 0;	1091	current_weapon = 0;
963	}	1092	}
964		1093
965	void	1094	void
966	object::destroy (bool destroy_inventory)	1095	object::destroy ()
967	{	1096	{
968	if (destroyed ())	1097	if (destroyed ())
969	return;	1098	return;
970		1099
971	if (destroy_inventory)	1100	if (!is_head () && !head->destroyed ())
		1101	{
		1102	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1103	head->destroy ();
		1104	return;
		1105	}
		1106
972	destroy_inv (false);	1107	destroy_inv_fast ();
973		1108
974	if (is_head ())	1109	if (is_head ())
975	if (sound_destroy)	1110	if (sound_destroy)
976	play_sound (sound_destroy);	1111	play_sound (sound_destroy);
977	else if (flag [FLAG_MONSTER])	1112	else if (flag [FLAG_MONSTER])
978	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1113	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
979		1114
980	attachable::destroy ();	1115	attachable::destroy ();
981	}
982
983	/*
984	* sub_weight() recursively (outwards) subtracts a number from the
985	* weight of an object (and what is carried by it's environment(s)).
986	*/
987	void
988	sub_weight (object *op, signed long weight)
989	{
990	while (op != NULL)
991	{
992	if (op->type == CONTAINER)
993	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
994
995	op->carrying -= weight;
996	op = op->env;
997	}
998	}	1116	}
999		1117
1000	/* op->remove ():	1118	/* op->remove ():
1001	* This function removes the object op from the linked list of objects	1119	* This function removes the object op from the linked list of objects
1002	* which it is currently tied to. When this function is done, the	1120	* which it is currently tied to. When this function is done, the
…		…
1005	* the previous environment.	1123	* the previous environment.
1006	*/	1124	*/
1007	void	1125	void
1008	object::do_remove ()	1126	object::do_remove ()
1009	{	1127	{
1010	object *tmp, *last = 0;	1128	if (flag [FLAG_REMOVED])
1011	object *otmp;
1012
1013	if (QUERY_FLAG (this, FLAG_REMOVED))
1014	return;	1129	return;
1015		1130
1016	SET_FLAG (this, FLAG_REMOVED);
1017	INVOKE_OBJECT (REMOVE, this);	1131	INVOKE_OBJECT (REMOVE, this);
		1132
		1133	flag [FLAG_REMOVED] = true;
1018		1134
1019	if (more)	1135	if (more)
1020	more->remove ();	1136	more->remove ();
1021		1137
1022	/*	1138	/*
1023	* In this case, the object to be removed is in someones	1139	* In this case, the object to be removed is in someones
1024	* inventory.	1140	* inventory.
1025	*/	1141	*/
1026	if (env)	1142	if (env)
1027	{	1143	{
1028	if (nrof)	1144	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1029	sub_weight (env, weight * nrof);	1145	if (object *pl = visible_to ())
1030	else	1146	esrv_del_item (pl->contr, count);
1031	sub_weight (env, weight + carrying);	1147	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1032		1148
1033	/* NO_FIX_PLAYER is set when a great many changes are being	1149	adjust_weight (env, -total_weight ());
1034	* made to players inventory. If set, avoiding the call
1035	* to save cpu time.
1036	*/
1037	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1038	otmp->update_stats ();
1039		1150
1040	if (above)	1151	object *pl = in_player ();
1041	above->below = below;
1042	else
1043	env->inv = below;
1044
1045	if (below)
1046	below->above = above;
1047		1152
1048	/* we set up values so that it could be inserted into	1153	/* we set up values so that it could be inserted into
1049	* the map, but we don't actually do that - it is up	1154	* the map, but we don't actually do that - it is up
1050	* to the caller to decide what we want to do.	1155	* to the caller to decide what we want to do.
1051	*/	1156	*/
1052	x = env->x, y = env->y;
1053	map = env->map;	1157	map = env->map;
1054	above = 0, below = 0;	1158	x = env->x;
		1159	y = env->y;
		1160
		1161	// make sure cmov optimisation is applicable
		1162	*(above ? &above->below : &env->inv) = below;
		1163	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1164
		1165	above = 0;
		1166	below = 0;
1055	env = 0;	1167	env = 0;
		1168
		1169	if (pl && pl->is_player ())
		1170	{
		1171	if (expect_false (pl->contr->combat_ob == this))
		1172	{
		1173	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1174	pl->contr->combat_ob = 0;
		1175	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1176	}
		1177
		1178	if (expect_false (pl->contr->ranged_ob == this))
		1179	{
		1180	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1181	pl->contr->ranged_ob = 0;
		1182	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1183	}
		1184
		1185	pl->contr->queue_stats_update ();
		1186
		1187	if (expect_false (glow_radius) && pl->is_on_map ())
		1188	update_all_los (pl->map, pl->x, pl->y);
		1189	}
1056	}	1190	}
1057	else if (map)	1191	else if (map)
1058	{	1192	{
1059	if (type == PLAYER)
1060	{
1061	// leaving a spot always closes any open container on the ground
1062	if (container && !container->env)
1063	// this causes spurious floorbox updates, but it ensures
1064	// that the CLOSE event is being sent.
1065	close_container ();
1066
1067	--map->players;
1068	map->touch ();
1069	}
1070
1071	map->dirty = true;	1193	map->dirty = true;
1072	mapspace &ms = this->ms ();	1194	mapspace &ms = this->ms ();
1073		1195
		1196	if (object *pl = ms.player ())
		1197	{
		1198	if (is_player ())
		1199	{
		1200	if (!flag [FLAG_WIZPASS])
		1201	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1202
		1203	// leaving a spot always closes any open container on the ground
		1204	if (container && !container->env)
		1205	// this causes spurious floorbox updates, but it ensures
		1206	// that the CLOSE event is being sent.
		1207	close_container ();
		1208
		1209	--map->players;
		1210	map->touch ();
		1211	}
		1212	else if (pl->container_ () == this)
		1213	{
		1214	// removing a container should close it
		1215	close_container ();
		1216	}
		1217	else
		1218	esrv_del_item (pl->contr, count);
		1219	}
		1220
1074	/* link the object above us */	1221	/* link the object above us */
1075	if (above)	1222	// re-link, make sure compiler can easily use cmove
1076	above->below = below;	1223	*(above ? &above->below : &ms.top) = below;
1077	else	1224	*(below ? &below->above : &ms.bot) = above;
1078	ms.top = below; /* we were top, set new top */
1079
1080	/* Relink the object below us, if there is one */
1081	if (below)
1082	below->above = above;
1083	else
1084	{
1085	/* Nothing below, which means we need to relink map object for this space
1086	* use translated coordinates in case some oddness with map tiling is
1087	* evident
1088	*/
1089	if (GET_MAP_OB (map, x, y) != this)
1090	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 ());
1091
1092	ms.bot = above; /* goes on above it. */
1093	}
1094		1225
1095	above = 0;	1226	above = 0;
1096	below = 0;	1227	below = 0;
1097		1228
		1229	ms.invalidate ();
		1230
1098	if (map->in_memory == MAP_SAVING)	1231	if (map->in_memory == MAP_SAVING)
1099	return;	1232	return;
1100		1233
1101	int check_walk_off = !flag [FLAG_NO_APPLY];	1234	int check_walk_off = !flag [FLAG_NO_APPLY];
1102		1235
1103	if (object *pl = ms.player ())	1236	if (object *pl = ms.player ())
1104	{	1237	{
1105	if (pl->container == this)	1238	if (pl->container_ () == this)
1106	/* If a container that the player is currently using somehow gets	1239	/* If a container that the player is currently using somehow gets
1107	* removed (most likely destroyed), update the player view	1240	* removed (most likely destroyed), update the player view
1108	* appropriately.	1241	* appropriately.
1109	*/	1242	*/
1110	pl->close_container ();	1243	pl->close_container ();
1111		1244
		1245	//TODO: the floorbox prev/next might need updating
		1246	//esrv_del_item (pl->contr, count);
		1247	//TODO: update floorbox to preserve ordering
		1248	if (pl->contr->ns)
1112	pl->contr->ns->floorbox_update ();	1249	pl->contr->ns->floorbox_update ();
1113	}	1250	}
1114		1251
		1252	if (check_walk_off)
1115	for (tmp = ms.bot; tmp; tmp = tmp->above)	1253	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1116	{	1254	{
		1255	above = tmp->above;
		1256
1117	/* No point updating the players look faces if he is the object	1257	/* No point updating the players look faces if he is the object
1118	* being removed.	1258	* being removed.
1119	*/	1259	*/
1120		1260
1121	/* See if object moving off should effect something */	1261	/* See if object moving off should effect something */
1122	if (check_walk_off
1123	&& ((move_type & tmp->move_off)	1262	if ((move_type & tmp->move_off)
1124	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1263	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1125	{
1126	move_apply (tmp, this, 0);	1264	move_apply (tmp, this, 0);
1127
1128	if (destroyed ())
1129	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1130	}	1265	}
1131		1266
1132	last = tmp;	1267	if (affects_los ())
1133	}
1134
1135	/* last == NULL if there are no objects on this space */
1136	//TODO: this makes little sense, why only update the topmost object?
1137	if (!last)
1138	map->at (x, y).flags_ = 0;
1139	else
1140	update_object (last, UP_OBJ_REMOVE);
1141
1142	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1143	update_all_los (map, x, y);	1268	update_all_los (map, x, y);
1144	}	1269	}
1145	}	1270	}
1146		1271
1147	/*	1272	/*
…		…
1161	if (!top)	1286	if (!top)
1162	for (top = op; top && top->above; top = top->above)	1287	for (top = op; top && top->above; top = top->above)
1163	;	1288	;
1164		1289
1165	for (; top; top = top->below)	1290	for (; top; top = top->below)
1166	{
1167	if (top == op)
1168	continue;
1169
1170	if (object::can_merge (op, top))	1291	if (object::can_merge (op, top))
1171	{	1292	{
1172	top->nrof += op->nrof;	1293	top->nrof += op->nrof;
1173		1294
1174	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1295	if (object *pl = top->visible_to ())
1175	op->weight = 0; /* Don't want any adjustements now */	1296	esrv_update_item (UPD_NROF, pl, top);
		1297
		1298	op->weight = 0; // cancel the addition above
		1299	op->carrying = 0; // must be 0 already
		1300
1176	op->destroy ();	1301	op->destroy ();
		1302
1177	return top;	1303	return top;
1178	}	1304	}
1179	}
1180		1305
1181	return 0;	1306	return 0;
1182	}	1307	}
1183		1308
1184	void	1309	void
…		…
1189		1314
1190	object *prev = this;	1315	object *prev = this;
1191		1316
1192	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1317	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1193	{	1318	{
1194	object *op = arch_to_object (at);	1319	object *op = at->instance ();
1195		1320
1196	op->name = name;	1321	op->name = name;
1197	op->name_pl = name_pl;	1322	op->name_pl = name_pl;
1198	op->title = title;	1323	op->title = title;
1199		1324
…		…
1209	* job preparing multi-part monsters.	1334	* job preparing multi-part monsters.
1210	*/	1335	*/
1211	object *	1336	object *
1212	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1337	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1213	{	1338	{
		1339	op->remove ();
		1340
1214	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1341	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1215	{	1342	{
1216	tmp->x = x + tmp->arch->x;	1343	tmp->x = x + tmp->arch->x;
1217	tmp->y = y + tmp->arch->y;	1344	tmp->y = y + tmp->arch->y;
1218	}	1345	}
…		…
1235	* Passing 0 for flag gives proper default values, so flag really only needs	1362	* Passing 0 for flag gives proper default values, so flag really only needs
1236	* to be set if special handling is needed.	1363	* to be set if special handling is needed.
1237	*	1364	*
1238	* Return value:	1365	* Return value:
1239	* new object if 'op' was merged with other object	1366	* new object if 'op' was merged with other object
1240	* NULL if 'op' was destroyed	1367	* NULL if there was an error (destroyed, blocked etc.)
1241	* just 'op' otherwise	1368	* just 'op' otherwise
1242	*/	1369	*/
1243	object *	1370	object *
1244	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1371	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1245	{	1372	{
1246	assert (!op->flag [FLAG_FREED]);
1247
1248	object *top, *floor = NULL;
1249
1250	op->remove ();	1373	op->remove ();
		1374
		1375	if (m == &freed_map)//D TODO: remove soon
		1376	{//D
		1377	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1378	}//D
1251		1379
1252	/* Ideally, the caller figures this out. However, it complicates a lot	1380	/* Ideally, the caller figures this out. However, it complicates a lot
1253	* of areas of callers (eg, anything that uses find_free_spot would now	1381	* of areas of callers (eg, anything that uses find_free_spot would now
1254	* need extra work	1382	* need extra work
1255	*/	1383	*/
		1384	maptile *newmap = m;
1256	if (!xy_normalise (m, op->x, op->y))	1385	if (!xy_normalise (newmap, op->x, op->y))
1257	{	1386	{
1258	op->destroy ();	1387	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1259	return 0;	1388	return 0;
1260	}	1389	}
1261		1390
1262	if (object *more = op->more)	1391	if (object *more = op->more)
1263	if (!insert_ob_in_map (more, m, originator, flag))	1392	if (!insert_ob_in_map (more, m, originator, flag))
1264	return 0;	1393	return 0;
1265		1394
1266	CLEAR_FLAG (op, FLAG_REMOVED);	1395	op->flag [FLAG_REMOVED] = false;
1267		1396	op->env = 0;
1268	op->map = m;	1397	op->map = newmap;
		1398
1269	mapspace &ms = op->ms ();	1399	mapspace &ms = op->ms ();
1270		1400
1271	/* this has to be done after we translate the coordinates.	1401	/* this has to be done after we translate the coordinates.
1272	*/	1402	*/
1273	if (op->nrof && !(flag & INS_NO_MERGE))	1403	if (op->nrof && !(flag & INS_NO_MERGE))
1274	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1404	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1275	if (object::can_merge (op, tmp))	1405	if (object::can_merge (op, tmp))
1276	{	1406	{
		1407	// TODO: we actually want to update tmp, not op,
		1408	// but some caller surely breaks when we return tmp
		1409	// from here :/
1277	op->nrof += tmp->nrof;	1410	op->nrof += tmp->nrof;
1278	tmp->destroy ();	1411	tmp->destroy ();
1279	}	1412	}
1280		1413
1281	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1414	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1282	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1415	op->clr_flag (FLAG_INV_LOCKED);
1283		1416
1284	if (!QUERY_FLAG (op, FLAG_ALIVE))	1417	if (!op->flag [FLAG_ALIVE])
1285	CLEAR_FLAG (op, FLAG_NO_STEAL);	1418	op->clr_flag (FLAG_NO_STEAL);
1286		1419
1287	if (flag & INS_BELOW_ORIGINATOR)	1420	if (flag & INS_BELOW_ORIGINATOR)
1288	{	1421	{
1289	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1422	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1290	{	1423	{
1291	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1424	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1292	abort ();	1425	abort ();
1293	}	1426	}
1294		1427
		1428	if (!originator->is_on_map ())
		1429	{
		1430	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1431	op->debug_desc (), originator->debug_desc ());
		1432	abort ();
		1433	}
		1434
1295	op->above = originator;	1435	op->above = originator;
1296	op->below = originator->below;	1436	op->below = originator->below;
1297
1298	if (op->below)
1299	op->below->above = op;
1300	else
1301	ms.bot = op;
1302
1303	/* since *below* originator, no need to update top */
1304	originator->below = op;	1437	originator->below = op;
		1438
		1439	*(op->below ? &op->below->above : &ms.bot) = op;
1305	}	1440	}
1306	else	1441	else
1307	{	1442	{
1308	top = ms.bot;	1443	object *floor = 0;
		1444	object *top = ms.top;
1309		1445
1310	/* If there are other objects, then */	1446	/* If there are other objects, then */
1311	if (top)	1447	if (top)
1312	{	1448	{
1313	object *last = 0;
1314
1315	/*	1449	/*
1316	* If there are multiple objects on this space, we do some trickier handling.	1450	* If there are multiple objects on this space, we do some trickier handling.
1317	* We've already dealt with merging if appropriate.	1451	* We've already dealt with merging if appropriate.
1318	* Generally, we want to put the new object on top. But if	1452	* Generally, we want to put the new object on top. But if
1319	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1453	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1322	* once we get to them. This reduces the need to traverse over all of	1456	* once we get to them. This reduces the need to traverse over all of
1323	* them when adding another one - this saves quite a bit of cpu time	1457	* them when adding another one - this saves quite a bit of cpu time
1324	* when lots of spells are cast in one area. Currently, it is presumed	1458	* when lots of spells are cast in one area. Currently, it is presumed
1325	* that flying non pickable objects are spell objects.	1459	* that flying non pickable objects are spell objects.
1326	*/	1460	*/
1327	for (top = ms.bot; top; top = top->above)	1461	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1328	{	1462	{
1329	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1463	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1330	floor = top;	1464	floor = tmp;
1331		1465
1332	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1466	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1333	{	1467	{
1334	/* We insert above top, so we want this object below this */	1468	/* We insert above top, so we want this object below this */
1335	top = top->below;	1469	top = tmp->below;
1336	break;	1470	break;
1337	}	1471	}
1338		1472
1339	last = top;	1473	top = tmp;
1340	}	1474	}
1341
1342	/* Don't want top to be NULL, so set it to the last valid object */
1343	top = last;
1344		1475
1345	/* We let update_position deal with figuring out what the space	1476	/* We let update_position deal with figuring out what the space
1346	* looks like instead of lots of conditions here.	1477	* looks like instead of lots of conditions here.
1347	* makes things faster, and effectively the same result.	1478	* makes things faster, and effectively the same result.
1348	*/	1479	*/
…		…
1355	*/	1486	*/
1356	if (!(flag & INS_ON_TOP)	1487	if (!(flag & INS_ON_TOP)
1357	&& ms.flags () & P_BLOCKSVIEW	1488	&& ms.flags () & P_BLOCKSVIEW
1358	&& (op->face && !faces [op->face].visibility))	1489	&& (op->face && !faces [op->face].visibility))
1359	{	1490	{
		1491	object *last;
		1492
1360	for (last = top; last != floor; last = last->below)	1493	for (last = top; last != floor; last = last->below)
1361	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1494	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1362	break;	1495	break;
1363		1496
1364	/* Check to see if we found the object that blocks view,	1497	/* Check to see if we found the object that blocks view,
1365	* and make sure we have a below pointer for it so that	1498	* and make sure we have a below pointer for it so that
1366	* we can get inserted below this one, which requires we	1499	* we can get inserted below this one, which requires we
…		…
1372	} /* If objects on this space */	1505	} /* If objects on this space */
1373		1506
1374	if (flag & INS_ABOVE_FLOOR_ONLY)	1507	if (flag & INS_ABOVE_FLOOR_ONLY)
1375	top = floor;	1508	top = floor;
1376		1509
1377	/* Top is the object that our object (op) is going to get inserted above.	1510	// insert object above top, or bottom-most if top = 0
1378	*/
1379
1380	/* First object on this space */
1381	if (!top)	1511	if (!top)
1382	{	1512	{
		1513	op->below = 0;
1383	op->above = ms.bot;	1514	op->above = ms.bot;
1384
1385	if (op->above)
1386	op->above->below = op;
1387
1388	op->below = 0;
1389	ms.bot = op;	1515	ms.bot = op;
		1516
		1517	*(op->above ? &op->above->below : &ms.top) = op;
1390	}	1518	}
1391	else	1519	else
1392	{ /* get inserted into the stack above top */	1520	{
1393	op->above = top->above;	1521	op->above = top->above;
1394
1395	if (op->above)
1396	op->above->below = op;	1522	top->above = op;
1397		1523
1398	op->below = top;	1524	op->below = top;
1399	top->above = op;	1525	*(op->above ? &op->above->below : &ms.top) = op;
1400	}	1526	}
		1527	}
1401		1528
1402	if (!op->above)	1529	if (op->is_player ())
1403	ms.top = op;
1404	} /* else not INS_BELOW_ORIGINATOR */
1405
1406	if (op->type == PLAYER)
1407	{	1530	{
1408	op->contr->do_los = 1;	1531	op->contr->do_los = 1;
1409	++op->map->players;	1532	++op->map->players;
1410	op->map->touch ();	1533	op->map->touch ();
1411	}	1534	}
1412		1535
1413	op->map->dirty = true;	1536	op->map->dirty = true;
1414		1537
1415	if (object *pl = ms.player ())	1538	if (object *pl = ms.player ())
		1539	//TODO: the floorbox prev/next might need updating
		1540	//esrv_send_item (pl, op);
		1541	//TODO: update floorbox to preserve ordering
		1542	if (pl->contr->ns)
1416	pl->contr->ns->floorbox_update ();	1543	pl->contr->ns->floorbox_update ();
1417		1544
1418	/* If this object glows, it may affect lighting conditions that are	1545	/* If this object glows, it may affect lighting conditions that are
1419	* visible to others on this map. But update_all_los is really	1546	* visible to others on this map. But update_all_los is really
1420	* an inefficient way to do this, as it means los for all players	1547	* an inefficient way to do this, as it means los for all players
1421	* on the map will get recalculated. The players could very well	1548	* on the map will get recalculated. The players could very well
1422	* be far away from this change and not affected in any way -	1549	* be far away from this change and not affected in any way -
1423	* this should get redone to only look for players within range,	1550	* this should get redone to only look for players within range,
1424	* or just updating the P_UPTODATE for spaces within this area	1551	* or just updating the P_UPTODATE for spaces within this area
1425	* of effect may be sufficient.	1552	* of effect may be sufficient.
1426	*/	1553	*/
1427	if (op->map->darkness && (op->glow_radius != 0))	1554	if (op->affects_los ())
		1555	{
		1556	op->ms ().invalidate ();
1428	update_all_los (op->map, op->x, op->y);	1557	update_all_los (op->map, op->x, op->y);
		1558	}
1429		1559
1430	/* updates flags (blocked, alive, no magic, etc) for this map space */	1560	/* updates flags (blocked, alive, no magic, etc) for this map space */
1431	update_object (op, UP_OBJ_INSERT);	1561	update_object (op, UP_OBJ_INSERT);
1432		1562
1433	INVOKE_OBJECT (INSERT, op);	1563	INVOKE_OBJECT (INSERT, op);
…		…
1440	* blocked() and wall() work properly), and these flags are updated by	1570	* blocked() and wall() work properly), and these flags are updated by
1441	* update_object().	1571	* update_object().
1442	*/	1572	*/
1443		1573
1444	/* if this is not the head or flag has been passed, don't check walk on status */	1574	/* if this is not the head or flag has been passed, don't check walk on status */
1445	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1575	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1446	{	1576	{
1447	if (check_move_on (op, originator))	1577	if (check_move_on (op, originator))
1448	return 0;	1578	return 0;
1449		1579
1450	/* If we are a multi part object, lets work our way through the check	1580	/* If we are a multi part object, lets work our way through the check
…		…
1461	/* this function inserts an object in the map, but if it	1591	/* this function inserts an object in the map, but if it
1462	* finds an object of its own type, it'll remove that one first.	1592	* finds an object of its own type, it'll remove that one first.
1463	* op is the object to insert it under: supplies x and the map.	1593	* op is the object to insert it under: supplies x and the map.
1464	*/	1594	*/
1465	void	1595	void
1466	replace_insert_ob_in_map (const char *arch_string, object *op)	1596	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1467	{	1597	{
1468	object *tmp, *tmp1;
1469
1470	/* first search for itself and remove any old instances */	1598	/* first search for itself and remove any old instances */
1471		1599
1472	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1600	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1473	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1601	if (tmp->arch->archname == archname) /* same archetype */
1474	tmp->destroy ();	1602	tmp->destroy ();
1475		1603
1476	tmp1 = arch_to_object (archetype::find (arch_string));	1604	object *tmp = archetype::find (archname)->instance ();
1477		1605
1478	tmp1->x = op->x;	1606	tmp->x = op->x;
1479	tmp1->y = op->y;	1607	tmp->y = op->y;
		1608
1480	insert_ob_in_map (tmp1, op->map, op, 0);	1609	insert_ob_in_map (tmp, op->map, op, 0);
1481	}	1610	}
1482		1611
1483	object *	1612	object *
1484	object::insert_at (object *where, object *originator, int flags)	1613	object::insert_at (object *where, object *originator, int flags)
1485	{	1614	{
		1615	if (where->env)
		1616	return where->env->insert (this);
		1617	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1618	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1619	}
1488		1620
1489	/*	1621	// check whether we can put this into the map, respect max_volume, max_items
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1622	bool
1491	* is returned contains nr objects, and the remaining parts contains	1623	object::can_drop_at (maptile *m, int x, int y, object *originator)
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *
1497	get_split_ob (object *orig_ob, uint32 nr)
1498	{	1624	{
1499	object *newob;	1625	mapspace &ms = m->at (x, y);
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501		1626
1502	if (orig_ob->nrof < nr)	1627	int items = ms.items ();
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}
1507		1628
1508	newob = object_create_clone (orig_ob);	1629	if (!items // testing !items ensures we can drop at least one item
		1630	|| (items < m->max_items
		1631	&& ms.volume () < m->max_volume))
		1632	return true;
1509		1633
1510	if ((orig_ob->nrof -= nr) < 1)	1634	if (originator && originator->is_player ())
1511	orig_ob->destroy (1);	1635	originator->contr->failmsgf (
1512	else if (!is_removed)	1636	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1513	{	1637	query_name ()
1514	if (orig_ob->env != NULL)	1638	);
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}
1522	}
1523		1639
1524	newob->nrof = nr;	1640	return false;
1525
1526	return newob;
1527	}	1641	}
1528		1642
1529	/*	1643	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1644	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1645	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1646	* is subsequently removed and freed.
1533	*	1647	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1648	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1649	*/
		1650	bool
		1651	object::decrease (sint32 nr)
		1652	{
		1653	if (!nr)
		1654	return true;
		1655
		1656	nr = min (nr, nrof);
		1657
		1658	if (nrof > nr)
		1659	{
		1660	nrof -= nr;
		1661	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1662
		1663	if (object *pl = visible_to ())
		1664	esrv_update_item (UPD_NROF, pl, this);
		1665
		1666	return true;
		1667	}
		1668	else
		1669	{
		1670	destroy ();
		1671	return false;
		1672	}
		1673	}
		1674
		1675	/*
		1676	* split(ob,nr) splits up ob into two parts. The part which
		1677	* is returned contains nr objects, and the remaining parts contains
		1678	* the rest (or is removed and returned if that number is 0).
		1679	* On failure, NULL is returned.
		1680	*/
1536	object *	1681	object *
1537	decrease_ob_nr (object *op, uint32 i)	1682	object::split (sint32 nr)
1538	{	1683	{
1539	object *tmp;	1684	int have = number_of ();
1540		1685
1541	if (i == 0) /* objects with op->nrof require this check */	1686	if (have < nr)
1542	return op;	1687	return 0;
1543		1688	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1689	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1690	remove ();
1579	op->nrof = 0;	1691	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1692	}
1584	else	1693	else
1585	{	1694	{
1586	object *above = op->above;	1695	decrease (nr);
1587		1696
1588	if (i < op->nrof)	1697	object *op = deep_clone ();
1589	op->nrof -= i;	1698	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1699	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}
1614	}
1615
1616	/*
1617	* add_weight(object, weight) adds the specified weight to an object,
1618	* and also updates how much the environment(s) is/are carrying.
1619	*/
1620	void
1621	add_weight (object *op, signed long weight)
1622	{
1623	while (op != NULL)
1624	{
1625	if (op->type == CONTAINER)
1626	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1627
1628	op->carrying += weight;
1629	op = op->env;
1630	}	1700	}
1631	}	1701	}
1632		1702
1633	object *	1703	object *
1634	insert_ob_in_ob (object *op, object *where)	1704	insert_ob_in_ob (object *op, object *where)
…		…
1659	* be != op, if items are merged. -Tero	1729	* be != op, if items are merged. -Tero
1660	*/	1730	*/
1661	object *	1731	object *
1662	object::insert (object *op)	1732	object::insert (object *op)
1663	{	1733	{
1664	if (!QUERY_FLAG (op, FLAG_REMOVED))
1665	op->remove ();
1666
1667	if (op->more)	1734	if (op->more)
1668	{	1735	{
1669	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1736	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1670	return op;	1737	return op;
1671	}	1738	}
1672		1739
1673	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1740	op->remove ();
1674	CLEAR_FLAG (op, FLAG_REMOVED);	1741
		1742	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1675		1743
1676	if (op->nrof)	1744	if (op->nrof)
1677	{
1678	for (object *tmp = inv; tmp; tmp = tmp->below)	1745	for (object *tmp = inv; tmp; tmp = tmp->below)
1679	if (object::can_merge (tmp, op))	1746	if (object::can_merge (tmp, op))
1680	{	1747	{
1681	/* return the original object and remove inserted object	1748	/* return the original object and remove inserted object
1682	(client needs the original object) */	1749	(client needs the original object) */
1683	tmp->nrof += op->nrof;	1750	tmp->nrof += op->nrof;
1684	/* Weight handling gets pretty funky. Since we are adding to	1751
1685	* tmp->nrof, we need to increase the weight.	1752	if (object *pl = tmp->visible_to ())
1686	*/	1753	esrv_update_item (UPD_NROF, pl, tmp);
		1754
1687	add_weight (this, op->weight * op->nrof);	1755	adjust_weight (this, op->total_weight ());
1688	SET_FLAG (op, FLAG_REMOVED);	1756
1689	op->destroy (); /* free the inserted object */	1757	op->destroy ();
1690	op = tmp;	1758	op = tmp;
1691	op->remove (); /* and fix old object's links */	1759	goto inserted;
1692	CLEAR_FLAG (op, FLAG_REMOVED);
1693	break;
1694	}	1760	}
1695		1761
1696	/* I assume combined objects have no inventory
1697	* We add the weight - this object could have just been removed
1698	* (if it was possible to merge). calling remove_ob will subtract
1699	* the weight, so we need to add it in again, since we actually do
1700	* the linking below
1701	*/
1702	add_weight (this, op->weight * op->nrof);
1703	}
1704	else
1705	add_weight (this, (op->weight + op->carrying));
1706
1707	if (object *otmp = this->in_player ())
1708	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1709	otmp->update_stats ();
1710
1711	op->owner = 0; // its his/hers now. period.	1762	op->owner = 0; // it's his/hers now. period.
1712	op->map = 0;	1763	op->map = 0;
		1764	op->x = 0;
		1765	op->y = 0;
		1766
		1767	op->above = 0;
		1768	op->below = inv;
1713	op->env = this;	1769	op->env = this;
1714	op->above = 0;
1715	op->below = 0;
1716	op->x = op->y = 0;
1717		1770
		1771	if (inv)
		1772	inv->above = op;
		1773
		1774	inv = op;
		1775
		1776	op->flag [FLAG_REMOVED] = 0;
		1777
		1778	if (object *pl = op->visible_to ())
		1779	esrv_send_item (pl, op);
		1780
		1781	adjust_weight (this, op->total_weight ());
		1782
		1783	inserted:
1718	/* reset the light list and los of the players on the map */	1784	/* reset the light list and los of the players on the map */
1719	if (op->glow_radius && map)	1785	if (op->glow_radius && is_on_map ())
1720	{	1786	{
1721	#ifdef DEBUG_LIGHTS	1787	update_stats ();
1722	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1723	#endif /* DEBUG_LIGHTS */
1724	if (map->darkness)
1725	update_all_los (map, x, y);	1788	update_all_los (map, x, y);
1726	}
1727
1728	/* Client has no idea of ordering so lets not bother ordering it here.
1729	* It sure simplifies this function...
1730	*/
1731	if (!inv)
1732	inv = op;
1733	else
1734	{	1789	}
1735	op->below = inv;	1790	else if (is_player ())
1736	op->below->above = op;	1791	// if this is a player's inventory, update stats
1737	inv = op;	1792	contr->queue_stats_update ();
1738	}
1739		1793
1740	INVOKE_OBJECT (INSERT, this);	1794	INVOKE_OBJECT (INSERT, this);
1741		1795
1742	return op;	1796	return op;
1743	}	1797	}
…		…
1763	* on top.	1817	* on top.
1764	*/	1818	*/
1765	int	1819	int
1766	check_move_on (object *op, object *originator)	1820	check_move_on (object *op, object *originator)
1767	{	1821	{
		1822	if (op->flag [FLAG_NO_APPLY])
		1823	return 0;
		1824
1768	object *tmp;	1825	object *tmp;
1769	maptile *m = op->map;	1826	maptile *m = op->map;
1770	int x = op->x, y = op->y;	1827	int x = op->x, y = op->y;
1771		1828
1772	MoveType move_on, move_slow, move_block;	1829	mapspace &ms = m->at (x, y);
1773		1830
1774	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1831	ms.update ();
1775	return 0;
1776		1832
1777	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1833	MoveType move_on = ms.move_on;
1778	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1834	MoveType move_slow = ms.move_slow;
1779	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1835	MoveType move_block = ms.move_block;
1780		1836
1781	/* if nothing on this space will slow op down or be applied,	1837	/* if nothing on this space will slow op down or be applied,
1782	* no need to do checking below. have to make sure move_type	1838	* no need to do checking below. have to make sure move_type
1783	* is set, as lots of objects don't have it set - we treat that	1839	* is set, as lots of objects don't have it set - we treat that
1784	* as walking.	1840	* as walking.
…		…
1795	return 0;	1851	return 0;
1796		1852
1797	/* The objects have to be checked from top to bottom.	1853	/* The objects have to be checked from top to bottom.
1798	* Hence, we first go to the top:	1854	* Hence, we first go to the top:
1799	*/	1855	*/
1800		1856	for (object *next, *tmp = ms.top; tmp; tmp = next)
1801	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1802	{
1803	/* Trim the search when we find the first other spell effect
1804	* this helps performance so that if a space has 50 spell objects,
1805	* we don't need to check all of them.
1806	*/
1807	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1808	break;
1809	}	1857	{
		1858	next = tmp->below;
1810		1859
1811	for (; tmp; tmp = tmp->below)
1812	{
1813	if (tmp == op)	1860	if (tmp == op)
1814	continue; /* Can't apply yourself */	1861	continue; /* Can't apply yourself */
1815		1862
1816	/* Check to see if one of the movement types should be slowed down.	1863	/* Check to see if one of the movement types should be slowed down.
1817	* Second check makes sure that the movement types not being slowed	1864	* Second check makes sure that the movement types not being slowed
1818	* (~slow_move) is not blocked on this space - just because the	1865	* (~slow_move) is not blocked on this space - just because the
1819	* space doesn't slow down swimming (for example), if you can't actually	1866	* space doesn't slow down swimming (for example), if you can't actually
1820	* swim on that space, can't use it to avoid the penalty.	1867	* swim on that space, can't use it to avoid the penalty.
1821	*/	1868	*/
1822	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1869	if (!op->flag [FLAG_WIZPASS])
1823	{	1870	{
1824	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1871	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1825	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1872	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1826	{	1873	{
1827
1828	float
1829	diff = tmp->move_slow_penalty * fabs (op->speed);	1874	float diff = tmp->move_slow_penalty * fabs (op->speed);
1830		1875
1831	if (op->type == PLAYER)	1876	if (op->is_player ())
1832	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1877	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1833	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1878	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1834	diff /= 4.0;	1879	diff /= 4.0;
1835		1880
1836	op->speed_left -= diff;	1881	op->speed_left -= diff;
1837	}	1882	}
1838	}	1883	}
…		…
1871	LOG (llevError, "Present_arch called outside map.\n");	1916	LOG (llevError, "Present_arch called outside map.\n");
1872	return NULL;	1917	return NULL;
1873	}	1918	}
1874		1919
1875	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1920	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1876	if (tmp->arch == at)	1921	if (tmp->arch->archname == at->archname)
1877	return tmp;	1922	return tmp;
1878		1923
1879	return NULL;	1924	return NULL;
1880	}	1925	}
1881		1926
…		…
1945	* The first matching object is returned, or NULL if none.	1990	* The first matching object is returned, or NULL if none.
1946	*/	1991	*/
1947	object *	1992	object *
1948	present_arch_in_ob (const archetype *at, const object *op)	1993	present_arch_in_ob (const archetype *at, const object *op)
1949	{	1994	{
1950	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1995	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1951	if (tmp->arch == at)	1996	if (tmp->arch->archname == at->archname)
1952	return tmp;	1997	return tmp;
1953		1998
1954	return NULL;	1999	return NULL;
1955	}	2000	}
1956		2001
…		…
1960	void	2005	void
1961	flag_inv (object *op, int flag)	2006	flag_inv (object *op, int flag)
1962	{	2007	{
1963	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2008	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1964	{	2009	{
1965	SET_FLAG (tmp, flag);	2010	tmp->set_flag (flag);
1966	flag_inv (tmp, flag);	2011	flag_inv (tmp, flag);
1967	}	2012	}
1968	}	2013	}
1969		2014
1970	/*	2015	/*
…		…
1973	void	2018	void
1974	unflag_inv (object *op, int flag)	2019	unflag_inv (object *op, int flag)
1975	{	2020	{
1976	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1977	{	2022	{
1978	CLEAR_FLAG (tmp, flag);	2023	tmp->clr_flag (flag);
1979	unflag_inv (tmp, flag);	2024	unflag_inv (tmp, flag);
1980	}	2025	}
1981	}	2026	}
1982		2027
1983	/*	2028	/*
…		…
2044	* head of the object should correspond for the entire object.	2089	* head of the object should correspond for the entire object.
2045	*/	2090	*/
2046	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2091	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2047	continue;	2092	continue;
2048		2093
2049	if (ob->blocked (m, pos.x, pos.y))	2094	if (ob->blocked (pos.m, pos.x, pos.y))
2050	continue;	2095	continue;
2051		2096
2052	altern [index++] = i;	2097	altern [index++] = i;
2053	}	2098	}
2054		2099
…		…
2122	* there is capable of.	2167	* there is capable of.
2123	*/	2168	*/
2124	int	2169	int
2125	find_dir (maptile *m, int x, int y, object *exclude)	2170	find_dir (maptile *m, int x, int y, object *exclude)
2126	{	2171	{
2127	int i, max = SIZEOFFREE, mflags;	2172	int max = SIZEOFFREE, mflags;
2128
2129	sint16 nx, ny;
2130	object *tmp;
2131	maptile *mp;
2132
2133	MoveType blocked, move_type;	2173	MoveType move_type;
2134		2174
2135	if (exclude && exclude->head_ () != exclude)	2175	if (exclude && exclude->head_ () != exclude)
2136	{	2176	{
2137	exclude = exclude->head;	2177	exclude = exclude->head;
2138	move_type = exclude->move_type;	2178	move_type = exclude->move_type;
…		…
2141	{	2181	{
2142	/* If we don't have anything, presume it can use all movement types. */	2182	/* If we don't have anything, presume it can use all movement types. */
2143	move_type = MOVE_ALL;	2183	move_type = MOVE_ALL;
2144	}	2184	}
2145		2185
2146	for (i = 1; i < max; i++)	2186	for (int i = 1; i < max; i++)
2147	{	2187	{
2148	mp = m;	2188	mapxy pos (m, x, y);
2149	nx = x + freearr_x[i];	2189	pos.move (i);
2150	ny = y + freearr_y[i];
2151		2190
2152	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2191	if (!pos.normalise ())
2153
2154	if (mflags & P_OUT_OF_MAP)
2155	max = maxfree[i];	2192	max = maxfree[i];
2156	else	2193	else
2157	{	2194	{
2158	mapspace &ms = mp->at (nx, ny);	2195	mapspace &ms = *pos;
2159		2196
2160	blocked = ms.move_block;
2161
2162	if ((move_type & blocked) == move_type)	2197	if ((move_type & ms.move_block) == move_type)
2163	max = maxfree[i];	2198	max = maxfree [i];
2164	else if (mflags & P_IS_ALIVE)	2199	else if (ms.flags () & P_IS_ALIVE)
2165	{	2200	{
2166	for (tmp = ms.bot; tmp; tmp = tmp->above)	2201	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2167	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2202	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2168	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2203	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2169	break;
2170
2171	if (tmp)
2172	return freedir[i];	2204	return freedir [i];
2173	}	2205	}
2174	}	2206	}
2175	}	2207	}
2176		2208
2177	return 0;	2209	return 0;
…		…
2186	{	2218	{
2187	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2219	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2188	}	2220	}
2189		2221
2190	/*	2222	/*
2191	* find_dir_2(delta-x,delta-y) will return a direction in which	2223	* find_dir_2(delta-x,delta-y) will return a direction value
2192	* an object which has subtracted the x and y coordinates of another	2224	* for running into direct [dx, dy].
2193	* object, needs to travel toward it.	2225	* (the opposite of crossfire's find_dir_2!)
2194	*/	2226	*/
2195	int	2227	int
2196	find_dir_2 (int x, int y)	2228	find_dir_2 (int x, int y)
2197	{	2229	{
		2230	#if 1 // new algorithm
		2231	// this works by putting x, y into 16 sectors, which
		2232	// are not equal sized, but are a better approximation
		2233	// then the old algorithm, and then using a mapping
		2234	// table to map it into a direction value.
		2235	// basically, it maps these comparisons to each bit
		2236	// bit #3: x < 0
		2237	// bit #2: y < 0
		2238	// bit #1: x > y
		2239	// bit #0: x > 2y
		2240
		2241	static const uint8 dir[16] = {
		2242	4, 5, 4, 3,
		2243	2, 1, 2, 3,
		2244	6, 5, 6, 7,
		2245	8, 1, 8, 7,
		2246	};
		2247	int sector = 0;
		2248
		2249	// this is a bit ugly, but more likely to result in branchless code
		2250	sector |= x < 0 ? 8 : 0;
		2251	x = x < 0 ? -x : x; // abs
		2252
		2253	sector |= y < 0 ? 4 : 0;
		2254	y = y < 0 ? -y : y; // abs
		2255
		2256	if (x > y)
		2257	{
		2258	sector |= 2;
		2259
		2260	if (x > y * 2)
		2261	sector |= 1;
		2262	}
		2263	else
		2264	{
		2265	if (y > x * 2)
		2266	sector |= 1;
		2267	else if (!y)
		2268	return 0; // x == 0 here
		2269	}
		2270
		2271	return dir [sector];
		2272	#else // old algorithm
2198	int q;	2273	int q;
2199		2274
2200	if (y)	2275	if (y)
2201	q = x * 100 / y;	2276	q = 128 * x / y;
2202	else if (x)	2277	else if (x)
2203	q = -300 * x;	2278	q = -512 * x; // to make it > 309
2204	else	2279	else
2205	return 0;	2280	return 0;
2206		2281
2207	if (y > 0)	2282	if (y > 0)
2208	{	2283	{
2209	if (q < -242)	2284	if (q < -309) return 7;
		2285	if (q < -52) return 6;
		2286	if (q < 52) return 5;
		2287	if (q < 309) return 4;
		2288
2210	return 3;	2289	return 3;
2211	if (q < -41)	2290	}
2212	return 2;	2291	else
2213	if (q < 41)	2292	{
2214	return 1;	2293	if (q < -309) return 3;
2215	if (q < 242)	2294	if (q < -52) return 2;
2216	return 8;	2295	if (q < 52) return 1;
		2296	if (q < 309) return 8;
		2297
2217	return 7;	2298	return 7;
2218	}	2299	}
2219		2300	#endif
2220	if (q < -242)
2221	return 7;
2222	if (q < -41)
2223	return 6;
2224	if (q < 41)
2225	return 5;
2226	if (q < 242)
2227	return 4;
2228
2229	return 3;
2230	}	2301	}
2231		2302
2232	/*	2303	/*
2233	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2304	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2234	* between two directions (which are expected to be absolute (see absdir())	2305	* between two directions (which are expected to be absolute (see absdir())
2235	*/	2306	*/
2236	int	2307	int
2237	dirdiff (int dir1, int dir2)	2308	dirdiff (int dir1, int dir2)
2238	{	2309	{
2239	int d;
2240
2241	d = abs (dir1 - dir2);	2310	int d = abs (dir1 - dir2);
2242	if (d > 4)
2243	d = 8 - d;
2244		2311
2245	return d;	2312	return d > 4 ? 8 - d : d;
2246	}	2313	}
2247		2314
2248	/* peterm:	2315	/* peterm:
2249	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2316	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2250	* Basically, this is a table of directions, and what directions	2317	* Basically, this is a table of directions, and what directions
…		…
2252	* This basically means that if direction is 15, then it could either go	2319	* This basically means that if direction is 15, then it could either go
2253	* direction 4, 14, or 16 to get back to where we are.	2320	* direction 4, 14, or 16 to get back to where we are.
2254	* Moved from spell_util.c to object.c with the other related direction	2321	* Moved from spell_util.c to object.c with the other related direction
2255	* functions.	2322	* functions.
2256	*/	2323	*/
2257	int reduction_dir[SIZEOFFREE][3] = {	2324	static const int reduction_dir[SIZEOFFREE][3] = {
2258	{0, 0, 0}, /* 0 */	2325	{0, 0, 0}, /* 0 */
2259	{0, 0, 0}, /* 1 */	2326	{0, 0, 0}, /* 1 */
2260	{0, 0, 0}, /* 2 */	2327	{0, 0, 0}, /* 2 */
2261	{0, 0, 0}, /* 3 */	2328	{0, 0, 0}, /* 3 */
2262	{0, 0, 0}, /* 4 */	2329	{0, 0, 0}, /* 4 */
…		…
2356	* Add a check so we can't pick up invisible objects (0.93.8)	2423	* Add a check so we can't pick up invisible objects (0.93.8)
2357	*/	2424	*/
2358	int	2425	int
2359	can_pick (const object *who, const object *item)	2426	can_pick (const object *who, const object *item)
2360	{	2427	{
2361	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2428	return /*who->flag [FLAG_WIZ]|| */
2362	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2429	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2363	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2430	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2364	}	2431	}
2365		2432
2366	/*	2433	/*
2367	* create clone from object to another	2434	* create clone from object to another
2368	*/	2435	*/
2369	object *	2436	object *
2370	object_create_clone (object *asrc)	2437	object::deep_clone ()
2371	{	2438	{
2372	object *dst = 0, *tmp, *src, *prev, *item;	2439	assert (("deep_clone called on non-head object", is_head ()));
2373		2440
2374	if (!asrc)	2441	object *dst = clone ();
2375	return 0;
2376		2442
2377	src = asrc->head_ ();	2443	object *prev = dst;
2378
2379	prev = 0;
2380	for (object *part = src; part; part = part->more)	2444	for (object *part = this->more; part; part = part->more)
2381	{	2445	{
2382	tmp = part->clone ();	2446	object *tmp = part->clone ();
2383	tmp->x -= src->x;
2384	tmp->y -= src->y;
2385
2386	if (!part->head)
2387	{
2388	dst = tmp;
2389	tmp->head = 0;
2390	}
2391	else
2392	tmp->head = dst;	2447	tmp->head = dst;
2393
2394	tmp->more = 0;
2395
2396	if (prev)
2397	prev->more = tmp;	2448	prev->more = tmp;
2398
2399	prev = tmp;	2449	prev = tmp;
2400	}	2450	}
2401		2451
2402	for (item = src->inv; item; item = item->below)	2452	for (object *item = inv; item; item = item->below)
2403	insert_ob_in_ob (object_create_clone (item), dst);	2453	insert_ob_in_ob (item->deep_clone (), dst);
2404		2454
2405	return dst;	2455	return dst;
2406	}	2456	}
2407		2457
2408	/* This returns the first object in who's inventory that	2458	/* This returns the first object in who's inventory that
…		…
2417	return tmp;	2467	return tmp;
2418		2468
2419	return 0;	2469	return 0;
2420	}	2470	}
2421		2471
2422	/* If ob has a field named key, return the link from the list,	2472	shstr_tmp
2423	* otherwise return NULL.	2473	object::kv_get (shstr_tmp key) const
2424	*
2425	* key must be a passed in shared string - otherwise, this won't
2426	* do the desired thing.
2427	*/
2428	key_value *
2429	get_ob_key_link (const object *ob, const char *key)
2430	{	2474	{
2431	for (key_value *link = ob->key_values; link; link = link->next)	2475	for (key_value *kv = key_values; kv; kv = kv->next)
2432	if (link->key == key)	2476	if (kv->key == key)
2433	return link;
2434
2435	return 0;
2436	}
2437
2438	/*
2439	* Returns the value of op has an extra_field for key, or NULL.
2440	*
2441	* The argument doesn't need to be a shared string.
2442	*
2443	* The returned string is shared.
2444	*/
2445	const char *
2446	get_ob_key_value (const object *op, const char *const key)
2447	{
2448	key_value *link;
2449	shstr_cmp canonical_key (key);
2450
2451	if (!canonical_key)
2452	{
2453	/* 1. There being a field named key on any object
2454	* implies there'd be a shared string to find.
2455	* 2. Since there isn't, no object has this field.
2456	* 3. Therefore, *this* object doesn't have this field.
2457	*/
2458	return 0;
2459	}
2460
2461	/* This is copied from get_ob_key_link() above -
2462	* only 4 lines, and saves the function call overhead.
2463	*/
2464	for (link = op->key_values; link; link = link->next)
2465	if (link->key == canonical_key)
2466	return link->value;	2477	return kv->value;
2467		2478
2468	return 0;	2479	return shstr ();
2469	}	2480	}
2470		2481
2471	/*	2482	void
2472	* Updates the canonical_key in op to value.	2483	object::kv_set (shstr_tmp key, shstr_tmp value)
2473	*
2474	* canonical_key is a shared string (value doesn't have to be).
2475	*
2476	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2477	* keys.
2478	*
2479	* Returns TRUE on success.
2480	*/
2481	int
2482	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2483	{	2484	{
2484	key_value *field = NULL, *last = NULL;	2485	for (key_value *kv = key_values; kv; kv = kv->next)
2485		2486	if (kv->key == key)
2486	for (field = op->key_values; field != NULL; field = field->next)
2487	{
2488	if (field->key != canonical_key)
2489	{	2487	{
2490	last = field;	2488	kv->value = value;
2491	continue;	2489	return;
2492	}	2490	}
2493		2491
2494	if (value)	2492	key_value *kv = new key_value;
2495	field->value = value;	2493
2496	else	2494	kv->next = key_values;
		2495	kv->key = key;
		2496	kv->value = value;
		2497
		2498	key_values = kv;
		2499	}
		2500
		2501	void
		2502	object::kv_del (shstr_tmp key)
		2503	{
		2504	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2505	if ((*kvp)->key == key)
2497	{	2506	{
2498	/* Basically, if the archetype has this key set,	2507	key_value *kv = *kvp;
2499	* we need to store the null value so when we save	2508	*kvp = (*kvp)->next;
2500	* it, we save the empty value so that when we load,	2509	delete kv;
2501	* we get this value back again.	2510	return;
2502	*/
2503	if (get_ob_key_link (op->arch, canonical_key))
2504	field->value = 0;
2505	else
2506	{
2507	if (last)
2508	last->next = field->next;
2509	else
2510	op->key_values = field->next;
2511
2512	delete field;
2513	}
2514	}	2511	}
2515	return TRUE;
2516	}
2517	/* IF we get here, key doesn't exist */
2518
2519	/* No field, we'll have to add it. */
2520
2521	if (!add_key)
2522	return FALSE;
2523
2524	/* There isn't any good reason to store a null
2525	* value in the key/value list. If the archetype has
2526	* this key, then we should also have it, so shouldn't
2527	* be here. If user wants to store empty strings,
2528	* should pass in ""
2529	*/
2530	if (value == NULL)
2531	return TRUE;
2532
2533	field = new key_value;
2534
2535	field->key = canonical_key;
2536	field->value = value;
2537	/* Usual prepend-addition. */
2538	field->next = op->key_values;
2539	op->key_values = field;
2540
2541	return TRUE;
2542	}
2543
2544	/*
2545	* Updates the key in op to value.
2546	*
2547	* If add_key is FALSE, this will only update existing keys,
2548	* and not add new ones.
2549	* In general, should be little reason FALSE is ever passed in for add_key
2550	*
2551	* Returns TRUE on success.
2552	*/
2553	int
2554	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2555	{
2556	shstr key_ (key);
2557
2558	return set_ob_key_value_s (op, key_, value, add_key);
2559	}	2512	}
2560		2513
2561	object::depth_iterator::depth_iterator (object *container)	2514	object::depth_iterator::depth_iterator (object *container)
2562	: iterator_base (container)	2515	: iterator_base (container)
2563	{	2516	{
…		…
2613	{	2566	{
2614	char flagdesc[512];	2567	char flagdesc[512];
2615	char info2[256 * 4];	2568	char info2[256 * 4];
2616	char *p = info;	2569	char *p = info;
2617		2570
2618	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2571	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2619	count, uuid.seq,	2572	count,
		2573	uuid.c_str (),
2620	&name,	2574	&name,
2621	title ? "\",title:\"" : "",	2575	title ? ",title:\"" : "",
2622	title ? (const char *)title : "",	2576	title ? (const char *)title : "",
		2577	title ? "\"" : "",
2623	flag_desc (flagdesc, 512), type);	2578	flag_desc (flagdesc, 512), type);
2624		2579
2625	if (!this->flag[FLAG_REMOVED] && env)	2580	if (!flag[FLAG_REMOVED] && env)
2626	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2581	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2627		2582
2628	if (map)	2583	if (map)
2629	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2584	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2630		2585
…		…
2645	{	2600	{
2646	return map ? map->region (x, y)	2601	return map ? map->region (x, y)
2647	: region::default_region ();	2602	: region::default_region ();
2648	}	2603	}
2649		2604
2650	const materialtype_t *
2651	object::dominant_material () const
2652	{
2653	if (materialtype_t *mt = name_to_material (materialname))
2654	return mt;
2655
2656	return name_to_material (shstr_unknown);
2657	}
2658
2659	void	2605	void
2660	object::open_container (object *new_container)	2606	object::open_container (object *new_container)
2661	{	2607	{
2662	if (container == new_container)	2608	if (container == new_container)
2663	return;	2609	return;
2664		2610
2665	if (object *old_container = container)	2611	object *old_container = container;
		2612
		2613	if (old_container)
2666	{	2614	{
2667	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2615	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2668	return;	2616	return;
2669		2617
2670	#if 0	2618	#if 0
…		…
2672	if (object *closer = old_container->inv)	2620	if (object *closer = old_container->inv)
2673	if (closer->type == CLOSE_CON)	2621	if (closer->type == CLOSE_CON)
2674	closer->destroy ();	2622	closer->destroy ();
2675	#endif	2623	#endif
2676		2624
		2625	// make sure the container is available
		2626	esrv_send_item (this, old_container);
		2627
2677	old_container->flag [FLAG_APPLIED] = 0;	2628	old_container->flag [FLAG_APPLIED] = false;
2678	container = 0;	2629	container = 0;
2679		2630
		2631	// client needs item update to make it work, client bug requires this to be separate
2680	esrv_update_item (UPD_FLAGS, this, old_container);	2632	esrv_update_item (UPD_FLAGS, this, old_container);
		2633
2681	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2634	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2682	play_sound (sound_find ("chest_close"));	2635	play_sound (sound_find ("chest_close"));
2683	}	2636	}
2684		2637
2685	if (new_container)	2638	if (new_container)
2686	{	2639	{
…		…
2690	// TODO: this does not seem to serve any purpose anymore?	2643	// TODO: this does not seem to serve any purpose anymore?
2691	#if 0	2644	#if 0
2692	// insert the "Close Container" object.	2645	// insert the "Close Container" object.
2693	if (archetype *closer = new_container->other_arch)	2646	if (archetype *closer = new_container->other_arch)
2694	{	2647	{
2695	object *closer = arch_to_object (new_container->other_arch);	2648	object *closer = new_container->other_arch->instance ();
2696	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2649	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2697	new_container->insert (closer);	2650	new_container->insert (closer);
2698	}	2651	}
2699	#endif	2652	#endif
2700		2653
2701	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2654	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2702		2655
		2656	// make sure the container is available, client bug requires this to be separate
		2657	esrv_send_item (this, new_container);
		2658
2703	new_container->flag [FLAG_APPLIED] = 1;	2659	new_container->flag [FLAG_APPLIED] = true;
2704	container = new_container;	2660	container = new_container;
2705		2661
		2662	// client needs flag change
2706	esrv_update_item (UPD_FLAGS, this, new_container);	2663	esrv_update_item (UPD_FLAGS, this, new_container);
2707	esrv_send_inventory (this, new_container);	2664	esrv_send_inventory (this, new_container);
2708	play_sound (sound_find ("chest_open"));	2665	play_sound (sound_find ("chest_open"));
2709	}	2666	}
		2667	// else if (!old_container->env && contr && contr->ns)
		2668	// contr->ns->floorbox_reset ();
2710	}	2669	}
2711		2670
2712	object *	2671	object *
2713	object::force_find (const shstr name)	2672	object::force_find (shstr_tmp name)
2714	{	2673	{
2715	/* cycle through his inventory to look for the MARK we want to	2674	/* cycle through his inventory to look for the MARK we want to
2716	* place	2675	* place
2717	*/	2676	*/
2718	for (object *tmp = inv; tmp; tmp = tmp->below)	2677	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2720	return splay (tmp);	2679	return splay (tmp);
2721		2680
2722	return 0;	2681	return 0;
2723	}	2682	}
2724		2683
		2684	//-GPL
		2685
2725	void	2686	void
		2687	object::force_set_timer (int duration)
		2688	{
		2689	this->duration = 1;
		2690	this->speed_left = -1.f;
		2691
		2692	this->set_speed (duration ? 1.f / duration : 0.f);
		2693	}
		2694
		2695	object *
2726	object::force_add (const shstr name, int duration)	2696	object::force_add (shstr_tmp name, int duration)
2727	{	2697	{
2728	if (object *force = force_find (name))	2698	if (object *force = force_find (name))
2729	force->destroy ();	2699	force->destroy ();
2730		2700
2731	object *force = get_archetype (FORCE_NAME);	2701	object *force = get_archetype (FORCE_NAME);
2732		2702
2733	force->slaying = name;	2703	force->slaying = name;
2734	force->stats.food = 1;	2704	force->force_set_timer (duration);
2735	force->speed_left = -1.f;
2736
2737	force->set_speed (duration ? 1.f / duration : 0.f);
2738	force->flag [FLAG_IS_USED_UP] = true;
2739	force->flag [FLAG_APPLIED] = true;	2705	force->flag [FLAG_APPLIED] = true;
2740		2706
2741	insert (force);	2707	return insert (force);
2742	}	2708	}
2743		2709
2744	void	2710	void
2745	object::play_sound (faceidx sound) const	2711	object::play_sound (faceidx sound) const
2746	{	2712	{
2747	if (!sound)	2713	if (!sound)
2748	return;	2714	return;
2749		2715
2750	if (flag [FLAG_REMOVED])	2716	if (is_on_map ())
		2717	map->play_sound (sound, x, y);
		2718	else if (object *pl = in_player ())
		2719	pl->contr->play_sound (sound);
		2720	}
		2721
		2722	void
		2723	object::say_msg (const char *msg) const
		2724	{
		2725	if (is_on_map ())
		2726	map->say_msg (msg, x, y);
		2727	else if (object *pl = in_player ())
		2728	pl->contr->play_sound (sound);
		2729	}
		2730
		2731	void
		2732	object::make_noise ()
		2733	{
		2734	// we do not model noise in the map, so instead put
		2735	// a temporary light into the noise source
		2736	// could use the map instead, but that's less reliable for our
		2737	// goal, which is to make invisibility a bit harder to exploit
		2738
		2739	// currently only works sensibly for players
		2740	if (!is_player ())
2751	return;	2741	return;
2752		2742
2753	if (env)	2743	// find old force, or create new one
2754	{	2744	object *force = force_find (shstr_noise_force);
2755	if (object *pl = in_player ())	2745
2756	pl->contr->play_sound (sound);	2746	if (force)
2757	}	2747	force->speed_left = -1.f; // patch old speed up
2758	else	2748	else
2759	map->play_sound (sound, x, y);	2749	{
2760	}	2750	force = archetype::get (shstr_noise_force);
2761		2751
		2752	force->slaying = shstr_noise_force;
		2753	force->stats.food = 1;
		2754	force->speed_left = -1.f;
		2755
		2756	force->set_speed (1.f / 4.f);
		2757	force->flag [FLAG_IS_USED_UP] = true;
		2758	force->flag [FLAG_APPLIED] = true;
		2759
		2760	insert (force);
		2761	}
		2762	}
		2763
		2764	void object::change_move_type (MoveType mt)
		2765	{
		2766	if (move_type == mt)
		2767	return;
		2768
		2769	if (is_on_map ())
		2770	{
		2771	// we are on the map, so handle move_on/off effects
		2772	remove ();
		2773	move_type = mt;
		2774	map->insert (this, x, y, this);
		2775	}
		2776	else
		2777	move_type = mt;
		2778	}
		2779
		2780	/* object should be a player.
		2781	* we return the object the player has marked with the 'mark' command
		2782	* below. If no match is found (or object has changed), we return
		2783	* NULL. We leave it up to the calling function to print messages if
		2784	* nothing is found.
		2785	*/
		2786	object *
		2787	object::mark () const
		2788	{
		2789	if (contr && contr->mark && contr->mark->env == this)
		2790	return contr->mark;
		2791	else
		2792	return 0;
		2793	}
		2794

Diff Legend

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