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.189 by root, Thu Sep 13 16:23:01 2007 UTC vs.
Revision 1.350 by root, Sun May 8 12:40:41 2011 UTC

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

Diff Legend

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