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

Diff Legend

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