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

Diff Legend

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