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.152 by root, Thu May 17 14:14:54 2007 UTC vs.
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 UTC

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

Diff Legend

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