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.198 by root, Mon Oct 22 02:52:48 2007 UTC vs.
Revision 1.357 by root, Tue Nov 13 01:29:30 2012 UTC

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

Diff Legend

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