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

Diff Legend

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