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

Diff Legend

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