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.195 by root, Wed Oct 17 19:08:12 2007 UTC vs.
Revision 1.353 by root, Fri Jan 27 22:00:39 2012 UTC

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

Diff Legend

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