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.65 by root, Wed Dec 13 00:42:03 2006 UTC vs.
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
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>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>	29	#include <sproto.h>
33	#include <loader.h>	30	#include <loader.h>
34		31
35	int nrofallocobjects = 0;	32	#include <bitset>
36	static UUID uuid;	33
		34	UUID UUID::cur;
		35	static uint64_t seq_next_save;
37	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
38		37
39	object *active_objects; /* List of active objects that need to be processed */	38	objectvec objects;
		39	activevec actives;
40		40
41	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,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	46	};
44	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,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
45	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
46	};	52	};
47	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,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
48	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	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
49	};	58	};
50	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
51	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,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	64	};
54		65
55	static void	66	static void
56	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
57	{	68	{
58	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
59		70	CALL_ARG_SV (newSVval64 (skip));
60	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
61	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
62		73	CALL_END;
63	FILE *fp;
64
65	if (!(fp = fopen (filename2, "w")))
66	{
67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68	return;
69	}
70
71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72	fclose (fp);
73	rename (filename2, filename1);
74	}	74	}
75		75
76	static void	76	static void
77	read_uuid (void)	77	read_uuid (void)
78	{	78	{
79	char filename[MAX_BUF];	79	char filename[MAX_BUF];
80		80
81	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
82		82
		83	seq_next_save = 0;
		84
83	FILE *fp;	85	FILE *fp;
84		86
85	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
86	{	88	{
87	if (errno == ENOENT)	89	if (errno == ENOENT)
88	{	90	{
89	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
90	uuid.seq = 0;	92	UUID::cur.seq = 0;
91	write_uuid ();	93	write_uuid (UUID_GAP, true);
92	return;	94	return;
93	}	95	}
94		96
95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96	_exit (1);	98	_exit (1);
97	}	99	}
98		100
99	int version;	101	UUID::BUF buf;
100	unsigned long long uid;	102	buf[0] = 0;
101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
102	{	106	{
103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
104	_exit (1);	108	_exit (1);
105	}	109	}
106		110
107	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
108	write_uuid ();	112
109	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
110	fclose (fp);	114	fclose (fp);
111	}	115	}
112		116
113	UUID	117	UUID
114	gen_uuid ()	118	UUID::gen ()
115	{	119	{
116	UUID uid;	120	UUID uid;
117		121
118	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
119		123
120	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
121	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
122		130
123	return uid;	131	return uid;
124	}	132	}
125		133
126	void	134	void
127	init_uuid ()	135	UUID::init ()
128	{	136	{
129	read_uuid ();	137	read_uuid ();
130	}	138	}
131		139
132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
133	static int	141	static bool
134	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
135	{	143	{
136	key_value *wants_field;	144	key_value *wants_field;
137		145
138	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
139	* objects with lists are rare, and lists stay short. If not, use a	147	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	148	* different structure or at least keep the lists sorted...
141	*/	149	*/
142		150
143	/* For each field in wants, */	151	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	153	{
146	key_value *has_field;	154	key_value *has_field;
147		155
148	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
150		158
151	if (has_field == NULL)	159	if (!has_field)
152	{
153	/* No field with that name. */	160	return 0; /* No field with that name. */
154	return FALSE;
155	}
156		161
157	/* Found the matching field. */	162	/* Found the matching field. */
158	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
159	{
160	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
161	return FALSE;
162	}
163		165
164	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
165	}	167	}
166		168
167	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
168	return TRUE;	170	return 1;
169	}	171	}
170		172
171	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
172	static int	174	static bool
173	compare_ob_value_lists (const object *ob1, const object *ob2)	175	compare_ob_value_lists (const object *ob1, const object *ob2)
174	{	176	{
175	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
176	* so we need to run the comparison *twice*. :(	178	* so we need to run the comparison *twice*. :(
177	*/	179	*/
…		…
183	*	185	*
184	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
187	*	189	*
188	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
189	*	191	*
190	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
191	* check weight	193	* check weight
192	*/	194	*/
193
194	bool object::can_merge (object *ob1, object *ob2)	195	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	196	{
196	/* A couple quicksanity checks */	197	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	198	if (ob1 == ob2
		199	|| ob1->type != ob2->type
		200	|| ob1->speed != ob2->speed
		201	|| ob1->value != ob2->value
		202	|| ob1->name != ob2->name)
198	return 0;	203	return 0;
199		204
200	if (ob1->speed != ob2->speed)	205	/* Do not merge objects if nrof would overflow. First part checks
		206	* for unsigned overflow (2c), second part checks whether the result
		207	* would fit into a 32 bit signed int, which is often used to hold
		208	* nrof values.
		209	*/
		210	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
201	return 0;	211	return 0;
202		212
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).
206	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)
208	return 0;
209
210	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
211	* This is to the comparison of the flags below will be OK. We	214	* This is to the comparison of the flags below will be OK. We
212	* just can't ignore the been applied or identified flags, as they	215	* just can't ignore the been applied or identified flags, as they
213	* are not equal - just if it has been identified, the been_applied	216	* are not equal - just if it has been identified, the been_applied
214	* flags lose any meaning.	217	* flags lose any meaning.
215	*/	218	*/
216	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		221
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		224
222		225	if (ob1->arch->name != ob2->arch->name
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	226	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	227	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	228	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	229	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
238	(ob1->attacktype != ob2->attacktype) ||	230	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	231	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	232	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	233	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	234	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	235	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	236	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	237	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	238	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	239	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	240	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	241	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	242	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	243	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	244	|| ob1->move_off != ob2->move_off
		245	|| ob1->move_slow != ob2->move_slow
		246	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	249	return 0;
254		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
255	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
257	*/	261	*/
258	if (ob1->inv || ob2->inv)	262	if (ob1->inv || ob2->inv)
259	{	263	{
260	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;
263
264	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!(ob1->inv && ob2->inv))
266	return 0;	265	return 0; /* inventories differ in length */
		266
		267	if (ob1->inv->below || ob2->inv->below)
		268	return 0; /* more than one object in inv */
		269
		270	if (!object::can_merge (ob1->inv, ob2->inv))
		271	return 0; /* inventory objects differ */
267		272
268	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	274	* if it is valid.
270	*/	275	*/
271	}	276	}
…		…
279		284
280	/* Note sure why the following is the case - either the object has to	285	/* Note sure why the following is the case - either the object has to
281	* be animated or have a very low speed. Is this an attempted monster	286	* be animated or have a very low speed. Is this an attempted monster
282	* check?	287	* check?
283	*/	288	*/
284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	289	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285	return 0;	290	return 0;
286		291
287	switch (ob1->type)	292	switch (ob1->type)
288	{	293	{
289	case SCROLL:	294	case SCROLL:
290	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
291	return 0;	296	return 0;
292	break;	297	break;
293	}	298	}
294		299
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	300	if (ob1->key_values || ob2->key_values)
296	{	301	{
297	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
		305
		306	if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	307	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;
303	}	308	}
304		309
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
307	{	311	{
308	ob1->optimise ();	312	ob1->optimise ();
309	ob2->optimise ();	313	ob2->optimise ();
310		314
311	if (ob1->self || ob2->self)	315	if (ob1->self || ob2->self)
		316	{
		317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		319
		320	if (k1 != k2)
312	return 0;	321	return 0;
		322
		323	if (k1 == 0)
		324	return 1;
		325
		326	if (!cfperl_can_merge (ob1, ob2))
		327	return 0;
		328	}
313	}	329	}
314		330
315	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
316	return 1;	332	return 1;
317	}	333	}
318		334
		335	// adjust weight per container type ("of holding")
		336	static sint32
		337	weight_adjust (object *op, sint32 weight)
		338	{
		339	return op->type == CONTAINER
		340	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		341	: weight;
		342	}
		343
319	/*	344	/*
		345	* adjust_weight(object, weight) adds the specified weight to an object,
		346	* and also updates how much the environment(s) is/are carrying.
		347	*/
		348	static void
		349	adjust_weight (object *op, sint32 weight)
		350	{
		351	while (op)
		352	{
		353	weight = weight_adjust (op, weight);
		354
		355	if (!weight)
		356	return;
		357
		358	op->carrying += weight;
		359
		360	if (object *pl = op->visible_to ())
		361	esrv_update_item (UPD_WEIGHT, pl, op);
		362
		363	op = op->env;
		364	}
		365	}
		366
		367	/*
320	* sum_weight() is a recursive function which calculates the weight	368	* this is a recursive function which calculates the weight
321	* an object is carrying. It goes through in figures out how much	369	* an object is carrying. It goes through op and figures out how much
322	* containers are carrying, and sums it up.	370	* containers are carrying, and sums it up.
323	*/	371	*/
324	long	372	void
325	sum_weight (object *op)	373	object::update_weight ()
326	{	374	{
327	long sum;	375	sint32 sum = 0;
328	object *inv;
329		376
330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	377	for (object *op = inv; op; op = op->below)
331	{	378	{
332	if (inv->inv)	379	if (op->inv)
333	sum_weight (inv);	380	op->update_weight ();
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	381
		382	sum += op->total_weight ();
		383	}
		384
		385	sum = weight_adjust (this, sum);
		386
		387	if (sum != carrying)
335	}	388	{
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;	389	carrying = sum;
342		390
343	return sum;	391	if (object *pl = visible_to ())
		392	esrv_update_item (UPD_WEIGHT, pl, this);
		393	}
344	}	394	}
345		395
346	/**	396	/*
347	* Return the outermost environment object for a given object.	397	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/	398	*/
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	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.
377	*/
378
379	char *	399	char *
380	dump_object (object *op)	400	dump_object (object *op)
381	{	401	{
382	if (!op)	402	if (!op)
383	return strdup ("[NULLOBJ]");	403	return strdup ("[NULLOBJ]");
384		404
385	object_freezer freezer;	405	object_freezer freezer;
386	save_object (freezer, op, 3);	406	op->write (freezer);
387	return freezer.as_string ();	407	return freezer.as_string ();
388	}	408	}
389		409
390	/*	410	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	411	* get_nearest_part(multi-object, object 2) returns the part of the
392	* multi-object 1 which is closest to the second object.	412	* multi-object 1 which is closest to the second object.
393	* If it's not a multi-object, it is returned.	413	* If it's not a multi-object, it is returned.
394	*/	414	*/
395
396	object *	415	object *
397	get_nearest_part (object *op, const object *pl)	416	get_nearest_part (object *op, const object *pl)
398	{	417	{
399	object *tmp, *closest;	418	object *tmp, *closest;
400	int last_dist, i;	419	int last_dist, i;
401		420
402	if (op->more == NULL)	421	if (!op->more)
403	return op;	422	return op;
		423
404	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	424	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		425	tmp;
		426	tmp = tmp->more)
405	if ((i = distance (tmp, pl)) < last_dist)	427	if ((i = distance (tmp, pl)) < last_dist)
406	closest = tmp, last_dist = i;	428	closest = tmp, last_dist = i;
		429
407	return closest;	430	return closest;
408	}	431	}
409		432
410	/*	433	/*
411	* Returns the object which has the count-variable equal to the argument.	434	* Returns the object which has the count-variable equal to the argument.
		435	* VERRRY slow.
412	*/	436	*/
413
414	object *	437	object *
415	find_object (tag_t i)	438	find_object (tag_t i)
416	{	439	{
417	for (object *op = object::first; op; op = op->next)	440	for_all_objects (op)
418	if (op->count == i)	441	if (op->count == i)
419	return op;	442	return op;
420		443
421	return 0;	444	return 0;
422	}	445	}
423		446
424	/*	447	/*
425	* Returns the first object which has a name equal to the argument.	448	* Returns the first object which has a name equal to the argument.
426	* Used only by the patch command, but not all that useful.	449	* Used only by the patch command, but not all that useful.
427	* Enables features like "patch <name-of-other-player> food 999"	450	* Enables features like "patch <name-of-other-player> food 999"
428	*/	451	*/
429
430	object *	452	object *
431	find_object_name (const char *str)	453	find_object_name (const char *str)
432	{	454	{
433	shstr_cmp str_ (str);	455	shstr_cmp str_ (str);
434	object *op;	456	object *op;
435		457
436	for (op = object::first; op != NULL; op = op->next)	458	for_all_objects (op)
437	if (op->name == str_)	459	if (op->name == str_)
438	break;	460	break;
439		461
440	return op;	462	return op;
441	}	463	}
442		464
443	void
444	free_all_object_data ()
445	{
446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
447	}
448
449	/*	465	/*
450	* Sets the owner and sets the skill and exp pointers to owner's current	466	* Sets the owner and sets the skill and exp pointers to owner's current
451	* skill and experience objects.	467	* skill and experience objects.
		468	* ACTUALLY NO! investigate! TODO
452	*/	469	*/
453	void	470	void
454	object::set_owner (object *owner)	471	object::set_owner (object *owner)
455	{	472	{
		473	// allow objects which own objects
456	if (!owner)	474	if (owner)
457	return;
458
459	/* next line added to allow objects which own objects */
460	/* Add a check for ownercounts in here, as I got into an endless loop
461	* with the fireball owning a poison cloud which then owned the
462	* fireball. I believe that was caused by one of the objects getting
463	* freed and then another object replacing it. Since the ownercounts
464	* didn't match, this check is valid and I believe that cause is valid.
465	*/
466	while (owner->owner)	475	while (owner->owner)
467	owner = owner->owner;	476	owner = owner->owner;
		477
		478	if (flag [FLAG_FREED])
		479	{
		480	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		481	return;
		482	}
468		483
469	this->owner = owner;	484	this->owner = owner;
		485	}
		486
		487	int
		488	object::slottype () const
		489	{
		490	if (type == SKILL)
		491	{
		492	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		493	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		494	}
		495	else
		496	{
		497	if (slot [body_combat].info) return slot_combat;
		498	if (slot [body_range ].info) return slot_ranged;
		499	}
		500
		501	return slot_none;
		502	}
		503
		504	bool
		505	object::change_weapon (object *ob)
		506	{
		507	if (current_weapon == ob)
		508	return true;
		509
		510	if (chosen_skill)
		511	chosen_skill->flag [FLAG_APPLIED] = false;
		512
		513	current_weapon = ob;
		514	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		515
		516	if (chosen_skill)
		517	chosen_skill->flag [FLAG_APPLIED] = true;
		518
		519	update_stats ();
		520
		521	if (ob)
		522	{
		523	// now check wether any body locations became invalid, in which case
		524	// we cannot apply the weapon at the moment.
		525	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		526	if (slot[i].used < 0)
		527	{
		528	current_weapon = chosen_skill = 0;
		529	update_stats ();
		530
		531	new_draw_info_format (NDI_UNIQUE, 0, this,
		532	"You try to balance all your items at once, "
		533	"but the %s is just too much for your body. "
		534	"[You need to unapply some items first.]", &ob->name);
		535	return false;
		536	}
		537
		538	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		539	}
		540	else
		541	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		542
		543	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		544	{
		545	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		546	&name, ob->debug_desc ());
		547	return false;
		548	}
		549
		550	return true;
470	}	551	}
471		552
472	/* Zero the key_values on op, decrementing the shared-string	553	/* Zero the key_values on op, decrementing the shared-string
473	* refcounts and freeing the links.	554	* refcounts and freeing the links.
474	*/	555	*/
475	static void	556	static void
476	free_key_values (object *op)	557	free_key_values (object *op)
477	{	558	{
478	for (key_value *i = op->key_values; i != 0;)	559	for (key_value *i = op->key_values; i; )
479	{	560	{
480	key_value *next = i->next;	561	key_value *next = i->next;
481	delete i;	562	delete i;
482		563
483	i = next;	564	i = next;
484	}	565	}
485		566
486	op->key_values = 0;	567	op->key_values = 0;
487	}	568	}
488		569
489	void object::clear ()	570	object &
		571	object::operator =(const object &src)
490	{	572	{
491	attachable_base::clear ();	573	bool is_freed = flag [FLAG_FREED];
		574	bool is_removed = flag [FLAG_REMOVED];
492		575
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	/*
532	* copy_to first frees everything allocated by the dst object,
533	* and then copies the contents of itself into the second
534	* object, allocating what needs to be allocated. Basically, any
535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
536	* if the first object is freed, the pointers in the new object
537	* will point at garbage.
538	*/
539	void
540	object::copy_to (object *dst)
541	{
542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
544
545	*(object_copy *)dst = *this;	576	*(object_copy *)this = src;
546	*(object_pod *)dst = *this;
547		577
548	if (self || cb)	578	flag [FLAG_FREED] = is_freed;
549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	579	flag [FLAG_REMOVED] = is_removed;
550
551	if (is_freed)
552	SET_FLAG (dst, FLAG_FREED);
553
554	if (is_removed)
555	SET_FLAG (dst, FLAG_REMOVED);
556
557	if (speed < 0)
558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
559		580
560	/* Copy over key_values, if any. */	581	/* Copy over key_values, if any. */
561	if (key_values)	582	if (src.key_values)
562	{	583	{
563	key_value *tail = 0;	584	key_value *tail = 0;
564	key_value *i;
565
566	dst->key_values = 0;	585	key_values = 0;
567		586
568	for (i = key_values; i; i = i->next)	587	for (key_value *i = src.key_values; i; i = i->next)
569	{	588	{
570	key_value *new_link = new key_value;	589	key_value *new_link = new key_value;
571		590
572	new_link->next = 0;	591	new_link->next = 0;
573	new_link->key = i->key;	592	new_link->key = i->key;
574	new_link->value = i->value;	593	new_link->value = i->value;
575		594
576	/* Try and be clever here, too. */	595	/* Try and be clever here, too. */
577	if (!dst->key_values)	596	if (!key_values)
578	{	597	{
579	dst->key_values = new_link;	598	key_values = new_link;
580	tail = new_link;	599	tail = new_link;
581	}	600	}
582	else	601	else
583	{	602	{
584	tail->next = new_link;	603	tail->next = new_link;
585	tail = new_link;	604	tail = new_link;
586	}	605	}
587	}	606	}
588	}	607	}
		608	}
589		609
590	update_ob_speed (dst);	610	/*
		611	* copy_to first frees everything allocated by the dst object,
		612	* and then copies the contents of itself into the second
		613	* object, allocating what needs to be allocated. Basically, any
		614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		615	* if the first object is freed, the pointers in the new object
		616	* will point at garbage.
		617	*/
		618	void
		619	object::copy_to (object *dst)
		620	{
		621	*dst = *this;
		622
		623	if (speed < 0)
		624	dst->speed_left -= rndm ();
		625
		626	dst->set_speed (dst->speed);
		627	}
		628
		629	void
		630	object::instantiate ()
		631	{
		632	if (!uuid.seq) // HACK
		633	uuid = UUID::gen ();
		634
		635	speed_left = -0.1f;
		636	/* copy the body_info to the body_used - this is only really
		637	* need for monsters, but doesn't hurt to do it for everything.
		638	* by doing so, when a monster is created, it has good starting
		639	* values for the body_used info, so when items are created
		640	* for it, they can be properly equipped.
		641	*/
		642	for (int i = NUM_BODY_LOCATIONS; i--; )
		643	slot[i].used = slot[i].info;
		644
		645	attachable::instantiate ();
591	}	646	}
592		647
593	object *	648	object *
594	object::clone ()	649	object::clone ()
595	{	650	{
…		…
601	/*	656	/*
602	* If an object with the IS_TURNABLE() flag needs to be turned due	657	* If an object with the IS_TURNABLE() flag needs to be turned due
603	* to the closest player being on the other side, this function can	658	* to the closest player being on the other side, this function can
604	* be called to update the face variable, _and_ how it looks on the map.	659	* be called to update the face variable, _and_ how it looks on the map.
605	*/	660	*/
606
607	void	661	void
608	update_turn_face (object *op)	662	update_turn_face (object *op)
609	{	663	{
610	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	664	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
611	return;	665	return;
		666
612	SET_ANIMATION (op, op->direction);	667	SET_ANIMATION (op, op->direction);
613	update_object (op, UP_OBJ_FACE);	668	update_object (op, UP_OBJ_FACE);
614	}	669	}
615		670
616	/*	671	/*
617	* Updates the speed of an object. If the speed changes from 0 to another	672	* Updates the speed of an object. If the speed changes from 0 to another
618	* value, or vice versa, then add/remove the object from the active list.	673	* value, or vice versa, then add/remove the object from the active list.
619	* This function needs to be called whenever the speed of an object changes.	674	* This function needs to be called whenever the speed of an object changes.
620	*/	675	*/
621	void	676	void
622	update_ob_speed (object *op)	677	object::set_speed (float speed)
623	{	678	{
624	extern int arch_init;	679	if (flag [FLAG_FREED] && speed)
625
626	/* No reason putting the archetypes objects on the speed list,
627	* since they never really need to be updated.
628	*/
629
630	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
631	{	680	{
632	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	681	LOG (llevError, "Object %s is freed but has speed.\n", &name);
633	#ifdef MANY_CORES
634	abort ();
635	#else
636	op->speed = 0;	682	speed = 0;
637	#endif
638	}
639
640	if (arch_init)
641	return;
642
643	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
644	{	683	}
645	/* If already on active list, don't do anything */
646	if (op->active_next || op->active_prev || op == active_objects)
647	return;
648		684
649	/* process_events() expects us to insert the object at the beginning	685	this->speed = speed;
650	* of the list. */
651	op->active_next = active_objects;
652		686
653	if (op->active_next != NULL)	687	if (has_active_speed ())
654	op->active_next->active_prev = op;	688	activate ();
655
656	active_objects = op;
657	}
658	else	689	else
659	{	690	deactivate ();
660	/* If not on the active list, nothing needs to be done */
661	if (!op->active_next && !op->active_prev && op != active_objects)
662	return;
663
664	if (op->active_prev == NULL)
665	{
666	active_objects = op->active_next;
667
668	if (op->active_next != NULL)
669	op->active_next->active_prev = NULL;
670	}
671	else
672	{
673	op->active_prev->active_next = op->active_next;
674
675	if (op->active_next)
676	op->active_next->active_prev = op->active_prev;
677	}
678
679	op->active_next = NULL;
680	op->active_prev = NULL;
681	}
682	}	691	}
683		692
684	/* This function removes object 'op' from the list of active
685	* objects.
686	* This should only be used for style maps or other such
687	* reference maps where you don't want an object that isn't
688	* in play chewing up cpu time getting processed.
689	* The reverse of this is to call update_ob_speed, which
690	* will do the right thing based on the speed of the object.
691	*/
692	void
693	remove_from_active_list (object *op)
694	{
695	/* If not on the active list, nothing needs to be done */
696	if (!op->active_next && !op->active_prev && op != active_objects)
697	return;
698
699	if (op->active_prev == NULL)
700	{
701	active_objects = op->active_next;
702	if (op->active_next != NULL)
703	op->active_next->active_prev = NULL;
704	}
705	else
706	{
707	op->active_prev->active_next = op->active_next;
708	if (op->active_next)
709	op->active_next->active_prev = op->active_prev;
710	}
711	op->active_next = NULL;
712	op->active_prev = NULL;
713	}
714
715	/*	693	/*
716	* update_object() updates the array which represents the map.	694	* update_object() updates the the map.
717	* It takes into account invisible objects (and represent squares covered	695	* It takes into account invisible objects (and represent squares covered
718	* by invisible objects by whatever is below them (unless it's another	696	* by invisible objects by whatever is below them (unless it's another
719	* invisible object, etc...)	697	* invisible object, etc...)
720	* If the object being updated is beneath a player, the look-window	698	* If the object being updated is beneath a player, the look-window
721	* of that player is updated (this might be a suboptimal way of	699	* of that player is updated (this might be a suboptimal way of
722	* updating that window, though, since update_object() is called _often_)	700	* updating that window, though, since update_object() is called _often_)
723	*	701	*
724	* action is a hint of what the caller believes need to be done.	702	* action is a hint of what the caller believes need to be done.
725	* For example, if the only thing that has changed is the face (due to
726	* an animation), we don't need to call update_position until that actually
727	* comes into view of a player. OTOH, many other things, like addition/removal
728	* of walls or living creatures may need us to update the flags now.
729	* current action are:	703	* current action are:
730	* UP_OBJ_INSERT: op was inserted	704	* UP_OBJ_INSERT: op was inserted
731	* UP_OBJ_REMOVE: op was removed	705	* UP_OBJ_REMOVE: op was removed
732	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	706	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
733	* as that is easier than trying to look at what may have changed.	707	* as that is easier than trying to look at what may have changed.
734	* UP_OBJ_FACE: only the objects face has changed.	708	* UP_OBJ_FACE: only the objects face has changed.
735	*/	709	*/
736
737	void	710	void
738	update_object (object *op, int action)	711	update_object (object *op, int action)
739	{	712	{
740	int update_now = 0, flags;
741	MoveType move_on, move_off, move_block, move_slow;
742
743	if (op == NULL)	713	if (op == NULL)
744	{	714	{
745	/* this should never happen */	715	/* this should never happen */
746	LOG (llevDebug, "update_object() called for NULL object.\n");	716	LOG (llevDebug, "update_object() called for NULL object.\n");
747	return;	717	return;
748	}	718	}
749		719
750	if (op->env != NULL)	720	if (op->env)
751	{	721	{
752	/* Animation is currently handled by client, so nothing	722	/* Animation is currently handled by client, so nothing
753	* to do in this case.	723	* to do in this case.
754	*/	724	*/
755	return;	725	return;
…		…
760	*/	730	*/
761	if (!op->map || op->map->in_memory == MAP_SAVING)	731	if (!op->map || op->map->in_memory == MAP_SAVING)
762	return;	732	return;
763		733
764	/* make sure the object is within map boundaries */	734	/* make sure the object is within map boundaries */
765	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	735	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
766	{	736	{
767	LOG (llevError, "update_object() called for object out of map!\n");	737	LOG (llevError, "update_object() called for object out of map!\n");
768	#ifdef MANY_CORES	738	#ifdef MANY_CORES
769	abort ();	739	abort ();
770	#endif	740	#endif
771	return;	741	return;
772	}	742	}
773		743
774	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	744	mapspace &m = op->ms ();
775	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
776	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
777	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
778	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
779	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
780		745
		746	if (!(m.flags_ & P_UPTODATE))
		747	/* nop */;
781	if (action == UP_OBJ_INSERT)	748	else if (action == UP_OBJ_INSERT)
782	{	749	{
		750	// this is likely overkill, TODO: revisit (schmorp)
783	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	751	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
784	update_now = 1;
785
786	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	752	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
787	update_now = 1;	753	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
788		754	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		755	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
789	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	756	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
790	update_now = 1;
791
792	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
793	update_now = 1;
794
795	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
796	update_now = 1;
797
798	if ((move_on | op->move_on) != move_on)	757	|| (m.move_on | op->move_on ) != m.move_on
799	update_now = 1;
800
801	if ((move_off | op->move_off) != move_off)	758	|| (m.move_off | op->move_off ) != m.move_off
802	update_now = 1;	759	|| (m.move_slow | op->move_slow) != m.move_slow
803
804	/* This isn't perfect, but I don't expect a lot of objects to	760	/* This isn't perfect, but I don't expect a lot of objects to
805	* to have move_allow right now.	761	* to have move_allow right now.
806	*/	762	*/
807	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	763	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
808	update_now = 1;	764	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
809		765	m.flags_ = 0;
810	if ((move_slow | op->move_slow) != move_slow)
811	update_now = 1;
812	}	766	}
813
814	/* if the object is being removed, we can't make intelligent	767	/* if the object is being removed, we can't make intelligent
815	* decisions, because remove_ob can't really pass the object	768	* decisions, because remove_ob can't really pass the object
816	* that is being removed.	769	* that is being removed.
817	*/	770	*/
818	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	771	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
819	update_now = 1;	772	m.flags_ = 0;
820	else if (action == UP_OBJ_FACE)	773	else if (action == UP_OBJ_FACE)
821	/* Nothing to do for that case */ ;	774	/* Nothing to do for that case */ ;
822	else	775	else
823	LOG (llevError, "update_object called with invalid action: %d\n", action);	776	LOG (llevError, "update_object called with invalid action: %d\n", action);
824		777
825	if (update_now)
826	{
827	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
828	update_position (op->map, op->x, op->y);
829	}
830
831	if (op->more != NULL)	778	if (op->more)
832	update_object (op->more, action);	779	update_object (op->more, action);
833	}
834
835	object::vector object::mortals;
836	object::vector object::objects; // not yet used
837	object *object::first;
838
839	void object::free_mortals ()
840	{
841	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
842	if ((*i)->refcnt)
843	++i; // further delay freeing
844	else
845	{
846	delete *i;
847	mortals.erase (i);
848	}
849	}	780	}
850		781
851	object::object ()	782	object::object ()
852	{	783	{
853	SET_FLAG (this, FLAG_REMOVED);	784	SET_FLAG (this, FLAG_REMOVED);
…		…
856	face = blank_face;	787	face = blank_face;
857	}	788	}
858		789
859	object::~object ()	790	object::~object ()
860	{	791	{
		792	unlink ();
		793
861	free_key_values (this);	794	free_key_values (this);
862	}	795	}
863		796
		797	static int object_count;
		798
864	void object::link ()	799	void object::link ()
865	{	800	{
		801	assert (!index);//D
		802	uuid = UUID::gen ();
866	count = ++ob_count;	803	count = ++object_count;
867	uuid = gen_uuid ();
868		804
869	prev = 0;	805	refcnt_inc ();
870	next = object::first;	806	objects.insert (this);
871
872	if (object::first)
873	object::first->prev = this;
874
875	object::first = this;
876	}	807	}
877		808
878	void object::unlink ()	809	void object::unlink ()
879	{	810	{
880	if (this == object::first)	811	if (!index)
881	object::first = next;	812	return;
882		813
883	/* Remove this object from the list of used objects */	814	objects.erase (this);
884	if (prev) prev->next = next;	815	refcnt_dec ();
885	if (next) next->prev = prev;	816	}
886		817
887	prev = 0;	818	void
888	next = 0;	819	object::activate ()
		820	{
		821	/* If already on active list, don't do anything */
		822	if (active)
		823	return;
		824
		825	if (has_active_speed ())
		826	actives.insert (this);
		827	}
		828
		829	void
		830	object::activate_recursive ()
		831	{
		832	activate ();
		833
		834	for (object *op = inv; op; op = op->below)
		835	op->activate_recursive ();
		836	}
		837
		838	/* This function removes object 'op' from the list of active
		839	* objects.
		840	* This should only be used for style maps or other such
		841	* reference maps where you don't want an object that isn't
		842	* in play chewing up cpu time getting processed.
		843	* The reverse of this is to call update_ob_speed, which
		844	* will do the right thing based on the speed of the object.
		845	*/
		846	void
		847	object::deactivate ()
		848	{
		849	/* If not on the active list, nothing needs to be done */
		850	if (!active)
		851	return;
		852
		853	actives.erase (this);
		854	}
		855
		856	void
		857	object::deactivate_recursive ()
		858	{
		859	for (object *op = inv; op; op = op->below)
		860	op->deactivate_recursive ();
		861
		862	deactivate ();
		863	}
		864
		865	void
		866	object::set_flag_inv (int flag, int value)
		867	{
		868	for (object *op = inv; op; op = op->below)
		869	{
		870	op->flag [flag] = value;
		871	op->set_flag_inv (flag, value);
		872	}
		873	}
		874
		875	/*
		876	* Remove and free all objects in the inventory of the given object.
		877	* object.c ?
		878	*/
		879	void
		880	object::destroy_inv (bool drop_to_ground)
		881	{
		882	// need to check first, because the checks below might segfault
		883	// as we might be on an invalid mapspace and crossfire code
		884	// is too buggy to ensure that the inventory is empty.
		885	// corollary: if you create arrows etc. with stuff in tis inventory,
		886	// cf will crash below with off-map x and y
		887	if (!inv)
		888	return;
		889
		890	/* Only if the space blocks everything do we not process -
		891	* if some form of movement is allowed, let objects
		892	* drop on that space.
		893	*/
		894	if (!drop_to_ground
		895	|| !map
		896	|| map->in_memory != MAP_ACTIVE
		897	|| map->nodrop
		898	|| ms ().move_block == MOVE_ALL)
		899	{
		900	while (inv)
		901	{
		902	inv->destroy_inv (drop_to_ground);
		903	inv->destroy ();
		904	}
		905	}
		906	else
		907	{ /* Put objects in inventory onto this space */
		908	while (inv)
		909	{
		910	object *op = inv;
		911
		912	if (op->flag [FLAG_STARTEQUIP]
		913	|| op->flag [FLAG_NO_DROP]
		914	|| op->type == RUNE
		915	|| op->type == TRAP
		916	|| op->flag [FLAG_IS_A_TEMPLATE]
		917	|| op->flag [FLAG_DESTROY_ON_DEATH])
		918	op->destroy ();
		919	else
		920	map->insert (op, x, y);
		921	}
		922	}
889	}	923	}
890		924
891	object *object::create ()	925	object *object::create ()
892	{	926	{
893	object *op = new object;	927	object *op = new object;
894	op->link ();	928	op->link ();
895	return op;	929	return op;
896	}	930	}
897		931
898	/*	932	void
899	* free_object() frees everything allocated by an object, removes	933	object::do_destroy ()
900	* it from the list of used objects, and puts it on the list of
901	* free objects. The IS_FREED() flag is set in the object.
902	* The object must have been removed by remove_ob() first for
903	* this function to succeed.
904	*
905	* If destroy_inventory is set, free inventory as well. Else drop items in
906	* inventory to the ground.
907	*/
908	void object::destroy (bool destroy_inventory)
909	{	934	{
910	if (QUERY_FLAG (this, FLAG_FREED))	935	if (object *pl = visible_to ())
911	return;	936	esrv_del_item (pl->contr, count);
912		937
913	if (QUERY_FLAG (this, FLAG_FRIENDLY))	938	attachable::do_destroy ();
		939
		940	if (flag [FLAG_IS_LINKED])
		941	remove_button_link (this);
		942
		943	if (flag [FLAG_FRIENDLY])
914	remove_friendly_object (this);	944	remove_friendly_object (this);
915		945
916	if (!QUERY_FLAG (this, FLAG_REMOVED))	946	if (!flag [FLAG_REMOVED])
917	remove ();	947	remove ();
918		948
919	SET_FLAG (this, FLAG_FREED);	949	destroy_inv (true);
920		950
921	if (more)	951	deactivate ();
922	{	952	unlink ();
923	more->destroy (destroy_inventory);
924	more = 0;
925	}
926		953
927	if (inv)	954	flag [FLAG_FREED] = 1;
928	{
929	/* Only if the space blocks everything do we not process -
930	* if some form of movement is allowed, let objects
931	* drop on that space.
932	*/
933	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
934	{
935	object *op = inv;
936
937	while (op)
938	{
939	object *tmp = op->below;
940	op->destroy (destroy_inventory);
941	op = tmp;
942	}
943	}
944	else
945	{ /* Put objects in inventory onto this space */
946	object *op = inv;
947
948	while (op)
949	{
950	object *tmp = op->below;
951
952	op->remove ();
953
954	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
955	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
956	op->destroy ();
957	else
958	{
959	op->x = x;
960	op->y = y;
961	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
962	}
963
964	op = tmp;
965	}
966	}
967	}
968		955
969	// hack to ensure that freed objects still have a valid map	956	// hack to ensure that freed objects still have a valid map
970	{	957	{
971	static maptile *freed_map; // freed objects are moved here to avoid crashes	958	static maptile *freed_map; // freed objects are moved here to avoid crashes
972		959
973	if (!freed_map)	960	if (!freed_map)
974	{	961	{
975	freed_map = new maptile;	962	freed_map = new maptile;
976		963
		964	freed_map->path = "<freed objects map>";
977	freed_map->name = "/internal/freed_objects_map";	965	freed_map->name = "/internal/freed_objects_map";
978	freed_map->width = 3;	966	freed_map->width = 3;
979	freed_map->height = 3;	967	freed_map->height = 3;
		968	freed_map->nodrop = 1;
980		969
981	freed_map->allocate ();	970	freed_map->alloc ();
		971	freed_map->in_memory = MAP_ACTIVE;
982	}	972	}
983		973
984	map = freed_map;	974	map = freed_map;
985	x = 1;	975	x = 1;
986	y = 1;	976	y = 1;
987	}	977	}
988		978
		979	if (more)
		980	{
		981	more->destroy ();
		982	more = 0;
		983	}
		984
		985	head = 0;
		986
989	// clear those pointers that likely might have circular references to us	987	// clear those pointers that likely might cause circular references
990	owner = 0;	988	owner = 0;
991	enemy = 0;	989	enemy = 0;
992	attacked_by = 0;	990	attacked_by = 0;
993		991	current_weapon = 0;
994	// only relevant for players(?), but make sure of it anyways
995	contr = 0;
996
997	/* Remove object from the active list */
998	speed = 0;
999	update_ob_speed (this);
1000
1001	unlink ();
1002
1003	mortals.push_back (this);
1004	}	992	}
1005		993
1006	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).
1009	*/
1010	void	994	void
1011	sub_weight (object *op, signed long weight)	995	object::destroy (bool destroy_inventory)
1012	{	996	{
1013	while (op != NULL)	997	if (destroyed ())
1014	{	998	return;
1015	if (op->type == CONTAINER)
1016	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1017		999
1018	op->carrying -= weight;	1000	if (destroy_inventory)
1019	op = op->env;	1001	destroy_inv (false);
1020	}	1002
		1003	if (is_head ())
		1004	if (sound_destroy)
		1005	play_sound (sound_destroy);
		1006	else if (flag [FLAG_MONSTER])
		1007	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
		1008
		1009	attachable::destroy ();
1021	}	1010	}
1022		1011
1023	/* op->remove ():	1012	/* op->remove ():
1024	* This function removes the object op from the linked list of objects	1013	* This function removes the object op from the linked list of objects
1025	* which it is currently tied to. When this function is done, the	1014	* which it is currently tied to. When this function is done, the
1026	* object will have no environment. If the object previously had an	1015	* object will have no environment. If the object previously had an
1027	* environment, the x and y coordinates will be updated to	1016	* environment, the x and y coordinates will be updated to
1028	* the previous environment.	1017	* the previous environment.
1029	* Beware: This function is called from the editor as well!
1030	*/	1018	*/
1031	void	1019	void
1032	object::remove ()	1020	object::do_remove ()
1033	{	1021	{
1034	object *tmp, *last = 0;	1022	object *tmp, *last = 0;
1035	object *otmp;	1023	object *otmp;
1036		1024
1037	int check_walk_off;
1038
1039	if (QUERY_FLAG (this, FLAG_REMOVED))	1025	if (QUERY_FLAG (this, FLAG_REMOVED))
1040	return;	1026	return;
1041		1027
1042	SET_FLAG (this, FLAG_REMOVED);	1028	SET_FLAG (this, FLAG_REMOVED);
		1029	INVOKE_OBJECT (REMOVE, this);
1043		1030
1044	if (more)	1031	if (more)
1045	more->remove ();	1032	more->remove ();
1046		1033
1047	/*	1034	/*
1048	* In this case, the object to be removed is in someones	1035	* In this case, the object to be removed is in someones
1049	* inventory.	1036	* inventory.
1050	*/	1037	*/
1051	if (env)	1038	if (env)
1052	{	1039	{
		1040	adjust_weight (env, -total_weight ());
		1041
		1042	*(above ? &above->below : &env->inv) = below;
		1043
1053	if (nrof)	1044	if (below)
1054	sub_weight (env, weight * nrof);	1045	below->above = above;
1055	else	1046
1056	sub_weight (env, weight + carrying);	1047	/* we set up values so that it could be inserted into
		1048	* the map, but we don't actually do that - it is up
		1049	* to the caller to decide what we want to do.
		1050	*/
		1051	map = env->map;
		1052	x = env->x;
		1053	y = env->y;
		1054	above = 0;
		1055	below = 0;
		1056	env = 0;
1057		1057
1058	/* NO_FIX_PLAYER is set when a great many changes are being	1058	/* NO_FIX_PLAYER is set when a great many changes are being
1059	* made to players inventory. If set, avoiding the call	1059	* made to players inventory. If set, avoiding the call
1060	* to save cpu time.	1060	* to save cpu time.
1061	*/	1061	*/
1062	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1062	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063	fix_player (otmp);	1063	otmp->update_stats ();
1064
1065	if (above != NULL)
1066	above->below = below;
1067	else
1068	env->inv = below;
1069
1070	if (below != NULL)
1071	below->above = above;
1072
1073	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.
1076	*/
1077	x = env->x, y = env->y;
1078	map = env->map;
1079	above = 0, below = 0;
1080	env = 0;
1081	}	1064	}
1082	else if (map)	1065	else if (map)
1083	{	1066	{
1084	/* Re did the following section of code - it looks like it had	1067	if (type == PLAYER)
1085	* lots of logic for things we no longer care about
1086	*/	1068	{
		1069	// leaving a spot always closes any open container on the ground
		1070	if (container && !container->env)
		1071	// this causes spurious floorbox updates, but it ensures
		1072	// that the CLOSE event is being sent.
		1073	close_container ();
		1074
		1075	--map->players;
		1076	map->touch ();
		1077	}
		1078
		1079	map->dirty = true;
		1080	mapspace &ms = this->ms ();
1087		1081
1088	/* link the object above us */	1082	/* link the object above us */
1089	if (above)	1083	if (above)
1090	above->below = below;	1084	above->below = below;
1091	else	1085	else
1092	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	1086	ms.top = below; /* we were top, set new top */
1093		1087
1094	/* Relink the object below us, if there is one */	1088	/* Relink the object below us, if there is one */
1095	if (below)	1089	if (below)
1096	below->above = above;	1090	below->above = above;
1097	else	1091	else
…		…
1099	/* Nothing below, which means we need to relink map object for this space	1093	/* Nothing below, which means we need to relink map object for this space
1100	* use translated coordinates in case some oddness with map tiling is	1094	* use translated coordinates in case some oddness with map tiling is
1101	* evident	1095	* evident
1102	*/	1096	*/
1103	if (GET_MAP_OB (map, x, y) != this)	1097	if (GET_MAP_OB (map, x, y) != this)
1104	{
1105	char *dump = dump_object (this);
1106	LOG (llevError,
1107	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1098	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 ());
1108	free (dump);
1109	dump = dump_object (GET_MAP_OB (map, x, y));
1110	LOG (llevError, "%s\n", dump);
1111	free (dump);
1112	}
1113		1099
1114	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1100	ms.bot = above; /* goes on above it. */
1115	}	1101	}
1116		1102
1117	above = 0;	1103	above = 0;
1118	below = 0;	1104	below = 0;
1119		1105
1120	if (map->in_memory == MAP_SAVING)	1106	if (map->in_memory == MAP_SAVING)
1121	return;	1107	return;
1122		1108
1123	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1109	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1110
		1111	if (object *pl = ms.player ())
		1112	{
		1113	if (pl->container == this)
		1114	/* If a container that the player is currently using somehow gets
		1115	* removed (most likely destroyed), update the player view
		1116	* appropriately.
		1117	*/
		1118	pl->close_container ();
		1119
		1120	pl->contr->ns->floorbox_update ();
		1121	}
		1122
1125	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1123	for (tmp = ms.bot; tmp; tmp = tmp->above)
1126	{	1124	{
1127	/* No point updating the players look faces if he is the object	1125	/* No point updating the players look faces if he is the object
1128	* being removed.	1126	* being removed.
1129	*/	1127	*/
1130		1128
1131	if (tmp->type == PLAYER && tmp != this)
1132	{
1133	/* If a container that the player is currently using somehow gets
1134	* removed (most likely destroyed), update the player view
1135	* appropriately.
1136	*/
1137	if (tmp->container == this)
1138	{
1139	CLEAR_FLAG (this, FLAG_APPLIED);
1140	tmp->container = 0;
1141	}
1142
1143	tmp->contr->socket.update_look = 1;
1144	}
1145
1146	/* See if player moving off should effect something */	1129	/* See if object moving off should effect something */
1147	if (check_walk_off	1130	if (check_walk_off
1148	&& ((move_type & tmp->move_off)	1131	&& ((move_type & tmp->move_off)
1149	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1150	{	1133	{
1151	move_apply (tmp, this, 0);	1134	move_apply (tmp, this, 0);
1152		1135
1153	if (destroyed ())	1136	if (destroyed ())
1154	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1155	}	1138	}
1156		1139
1157	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1158
1159	if (tmp->above == tmp)
1160	tmp->above = 0;
1161
1162	last = tmp;	1140	last = tmp;
1163	}	1141	}
1164		1142
1165	/* last == NULL of there are no objects on this space */	1143	/* last == NULL if there are no objects on this space */
		1144	//TODO: this makes little sense, why only update the topmost object?
1166	if (!last)	1145	if (!last)
1167	{	1146	map->at (x, y).flags_ = 0;
1168	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1169	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1170	* those out anyways, and if there are any flags set right now, they won't
1171	* be correct anyways.
1172	*/
1173	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1174	update_position (map, x, y);
1175	}
1176	else	1147	else
1177	update_object (last, UP_OBJ_REMOVE);	1148	update_object (last, UP_OBJ_REMOVE);
1178		1149
1179	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1150	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1180	update_all_los (map, x, y);	1151	update_all_los (map, x, y);
1181	}	1152	}
1182	}	1153	}
1183		1154
1184	/*	1155	/*
…		…
1193	merge_ob (object *op, object *top)	1164	merge_ob (object *op, object *top)
1194	{	1165	{
1195	if (!op->nrof)	1166	if (!op->nrof)
1196	return 0;	1167	return 0;
1197		1168
1198	if (top == NULL)	1169	if (!top)
1199	for (top = op; top != NULL && top->above != NULL; top = top->above);	1170	for (top = op; top && top->above; top = top->above)
		1171	;
1200		1172
1201	for (; top != NULL; top = top->below)	1173	for (; top; top = top->below)
1202	{	1174	{
1203	if (top == op)	1175	if (top == op)
1204	continue;	1176	continue;
1205	if (CAN_MERGE (op, top))	1177
		1178	if (object::can_merge (op, top))
1206	{	1179	{
1207	top->nrof += op->nrof;	1180	top->nrof += op->nrof;
1208		1181
1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1182	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1210	op->weight = 0; /* Don't want any adjustements now */	1183	op->weight = 0; /* Don't want any adjustements now */
…		…
1214	}	1187	}
1215		1188
1216	return 0;	1189	return 0;
1217	}	1190	}
1218		1191
		1192	void
		1193	object::expand_tail ()
		1194	{
		1195	if (more)
		1196	return;
		1197
		1198	object *prev = this;
		1199
		1200	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1201	{
		1202	object *op = arch_to_object (at);
		1203
		1204	op->name = name;
		1205	op->name_pl = name_pl;
		1206	op->title = title;
		1207
		1208	op->head = this;
		1209	prev->more = op;
		1210
		1211	prev = op;
		1212	}
		1213	}
		1214
1219	/*	1215	/*
1220	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1216	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1221	* job preparing multi-part monsters	1217	* job preparing multi-part monsters.
1222	*/	1218	*/
1223	object *	1219	object *
1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1220	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1225	{	1221	{
1226	object *tmp;
1227
1228	if (op->head)
1229	op = op->head;
1230
1231	for (tmp = op; tmp; tmp = tmp->more)	1222	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1232	{	1223	{
1233	tmp->x = x + tmp->arch->clone.x;	1224	tmp->x = x + tmp->arch->x;
1234	tmp->y = y + tmp->arch->clone.y;	1225	tmp->y = y + tmp->arch->y;
1235	}	1226	}
1236		1227
1237	return insert_ob_in_map (op, m, originator, flag);	1228	return insert_ob_in_map (op, m, originator, flag);
1238	}	1229	}
1239		1230
…		…
1255	* Return value:	1246	* Return value:
1256	* new object if 'op' was merged with other object	1247	* new object if 'op' was merged with other object
1257	* NULL if 'op' was destroyed	1248	* NULL if 'op' was destroyed
1258	* just 'op' otherwise	1249	* just 'op' otherwise
1259	*/	1250	*/
1260
1261	object *	1251	object *
1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1252	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1263	{	1253	{
		1254	assert (!op->flag [FLAG_FREED]);
		1255
1264	object *tmp, *top, *floor = NULL;	1256	object *top, *floor = NULL;
1265	sint16 x, y;
1266		1257
1267	if (QUERY_FLAG (op, FLAG_FREED))	1258	op->remove ();
1268	{
1269	LOG (llevError, "Trying to insert freed object!\n");
1270	return NULL;
1271	}
1272
1273	if (m == NULL)
1274	{
1275	char *dump = dump_object (op);
1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1277	free (dump);
1278	return op;
1279	}
1280
1281	if (out_of_map (m, op->x, op->y))
1282	{
1283	char *dump = dump_object (op);
1284	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1285	#ifdef MANY_CORES
1286	/* Better to catch this here, as otherwise the next use of this object
1287	* is likely to cause a crash. Better to find out where it is getting
1288	* improperly inserted.
1289	*/
1290	abort ();
1291	#endif
1292	free (dump);
1293	return op;
1294	}
1295
1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1297	{
1298	char *dump = dump_object (op);
1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300	free (dump);
1301	return op;
1302	}
1303
1304	if (op->more != NULL)
1305	{
1306	/* The part may be on a different map. */
1307
1308	object *more = op->more;
1309
1310	/* We really need the caller to normalize coordinates - if
1311	* we set the map, that doesn't work if the location is within
1312	* a map and this is straddling an edge. So only if coordinate
1313	* is clear wrong do we normalize it.
1314	*/
1315	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1316	more->map = get_map_from_coord (m, &more->x, &more->y);
1317	else if (!more->map)
1318	{
1319	/* For backwards compatibility - when not dealing with tiled maps,
1320	* more->map should always point to the parent.
1321	*/
1322	more->map = m;
1323	}
1324
1325	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1326	{
1327	if (!op->head)
1328	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1329
1330	return NULL;
1331	}
1332	}
1333
1334	CLEAR_FLAG (op, FLAG_REMOVED);
1335		1259
1336	/* Ideally, the caller figures this out. However, it complicates a lot	1260	/* Ideally, the caller figures this out. However, it complicates a lot
1337	* of areas of callers (eg, anything that uses find_free_spot would now	1261	* of areas of callers (eg, anything that uses find_free_spot would now
1338	* need extra work	1262	* need extra work
1339	*/	1263	*/
1340	op->map = get_map_from_coord (m, &op->x, &op->y);	1264	if (!xy_normalise (m, op->x, op->y))
1341	x = op->x;	1265	{
1342	y = op->y;	1266	op->destroy ();
		1267	return 0;
		1268	}
		1269
		1270	if (object *more = op->more)
		1271	if (!insert_ob_in_map (more, m, originator, flag))
		1272	return 0;
		1273
		1274	CLEAR_FLAG (op, FLAG_REMOVED);
		1275
		1276	op->map = m;
		1277	mapspace &ms = op->ms ();
1343		1278
1344	/* this has to be done after we translate the coordinates.	1279	/* this has to be done after we translate the coordinates.
1345	*/	1280	*/
1346	if (op->nrof && !(flag & INS_NO_MERGE))	1281	if (op->nrof && !(flag & INS_NO_MERGE))
1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1348	if (CAN_MERGE (op, tmp))	1283	if (object::can_merge (op, tmp))
1349	{	1284	{
1350	op->nrof += tmp->nrof;	1285	op->nrof += tmp->nrof;
1351	tmp->destroy ();	1286	tmp->destroy (1);
1352	}	1287	}
1353		1288
1354	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1355	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1290	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1356		1291
…		…
1369	op->below = originator->below;	1304	op->below = originator->below;
1370		1305
1371	if (op->below)	1306	if (op->below)
1372	op->below->above = op;	1307	op->below->above = op;
1373	else	1308	else
1374	SET_MAP_OB (op->map, op->x, op->y, op);	1309	ms.bot = op;
1375		1310
1376	/* since *below* originator, no need to update top */	1311	/* since *below* originator, no need to update top */
1377	originator->below = op;	1312	originator->below = op;
1378	}	1313	}
1379	else	1314	else
1380	{	1315	{
		1316	top = ms.bot;
		1317
1381	/* If there are other objects, then */	1318	/* If there are other objects, then */
1382	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1319	if (top)
1383	{	1320	{
1384	object *last = NULL;	1321	object *last = 0;
1385		1322
1386	/*	1323	/*
1387	* If there are multiple objects on this space, we do some trickier handling.	1324	* If there are multiple objects on this space, we do some trickier handling.
1388	* We've already dealt with merging if appropriate.	1325	* We've already dealt with merging if appropriate.
1389	* Generally, we want to put the new object on top. But if	1326	* Generally, we want to put the new object on top. But if
…		…
1393	* once we get to them. This reduces the need to traverse over all of	1330	* once we get to them. This reduces the need to traverse over all of
1394	* them when adding another one - this saves quite a bit of cpu time	1331	* them when adding another one - this saves quite a bit of cpu time
1395	* when lots of spells are cast in one area. Currently, it is presumed	1332	* when lots of spells are cast in one area. Currently, it is presumed
1396	* that flying non pickable objects are spell objects.	1333	* that flying non pickable objects are spell objects.
1397	*/	1334	*/
1398		1335	for (top = ms.bot; top; top = top->above)
1399	while (top != NULL)
1400	{	1336	{
1401	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1337	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1402	floor = top;	1338	floor = top;
1403		1339
1404	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1340	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1407	top = top->below;	1343	top = top->below;
1408	break;	1344	break;
1409	}	1345	}
1410		1346
1411	last = top;	1347	last = top;
1412	top = top->above;
1413	}	1348	}
1414		1349
1415	/* Don't want top to be NULL, so set it to the last valid object */	1350	/* Don't want top to be NULL, so set it to the last valid object */
1416	top = last;	1351	top = last;
1417		1352
…		…
1419	* looks like instead of lots of conditions here.	1354	* looks like instead of lots of conditions here.
1420	* makes things faster, and effectively the same result.	1355	* makes things faster, and effectively the same result.
1421	*/	1356	*/
1422		1357
1423	/* Have object 'fall below' other objects that block view.	1358	/* Have object 'fall below' other objects that block view.
1424	* Unless those objects are exits, type 66	1359	* Unless those objects are exits.
1425	* If INS_ON_TOP is used, don't do this processing	1360	* If INS_ON_TOP is used, don't do this processing
1426	* Need to find the object that in fact blocks view, otherwise	1361	* Need to find the object that in fact blocks view, otherwise
1427	* stacking is a bit odd.	1362	* stacking is a bit odd.
1428	*/	1363	*/
1429	if (!(flag & INS_ON_TOP) &&	1364	if (!(flag & INS_ON_TOP)
1430	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1365	&& ms.flags () & P_BLOCKSVIEW
		1366	&& (op->face && !faces [op->face].visibility))
1431	{	1367	{
1432	for (last = top; last != floor; last = last->below)	1368	for (last = top; last != floor; last = last->below)
1433	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1369	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1434	break;	1370	break;
		1371
1435	/* Check to see if we found the object that blocks view,	1372	/* Check to see if we found the object that blocks view,
1436	* and make sure we have a below pointer for it so that	1373	* and make sure we have a below pointer for it so that
1437	* we can get inserted below this one, which requires we	1374	* we can get inserted below this one, which requires we
1438	* set top to the object below us.	1375	* set top to the object below us.
1439	*/	1376	*/
1440	if (last && last->below && last != floor)	1377	if (last && last->below && last != floor)
1441	top = last->below;	1378	top = last->below;
1442	}	1379	}
1443	} /* If objects on this space */	1380	} /* If objects on this space */
1444		1381
1445	if (flag & INS_MAP_LOAD)
1446	top = GET_MAP_TOP (op->map, op->x, op->y);
1447
1448	if (flag & INS_ABOVE_FLOOR_ONLY)	1382	if (flag & INS_ABOVE_FLOOR_ONLY)
1449	top = floor;	1383	top = floor;
1450		1384
1451	/* Top is the object that our object (op) is going to get inserted above.	1385	/* Top is the object that our object (op) is going to get inserted above.
1452	*/	1386	*/
1453		1387
1454	/* First object on this space */	1388	/* First object on this space */
1455	if (!top)	1389	if (!top)
1456	{	1390	{
1457	op->above = GET_MAP_OB (op->map, op->x, op->y);	1391	op->above = ms.bot;
1458		1392
1459	if (op->above)	1393	if (op->above)
1460	op->above->below = op;	1394	op->above->below = op;
1461		1395
1462	op->below = NULL;	1396	op->below = 0;
1463	SET_MAP_OB (op->map, op->x, op->y, op);	1397	ms.bot = op;
1464	}	1398	}
1465	else	1399	else
1466	{ /* get inserted into the stack above top */	1400	{ /* get inserted into the stack above top */
1467	op->above = top->above;	1401	op->above = top->above;
1468		1402
…		…
1471		1405
1472	op->below = top;	1406	op->below = top;
1473	top->above = op;	1407	top->above = op;
1474	}	1408	}
1475		1409
1476	if (op->above == NULL)	1410	if (!op->above)
1477	SET_MAP_TOP (op->map, op->x, op->y, op);	1411	ms.top = op;
1478	} /* else not INS_BELOW_ORIGINATOR */	1412	} /* else not INS_BELOW_ORIGINATOR */
1479		1413
1480	if (op->type == PLAYER)	1414	if (op->type == PLAYER)
		1415	{
1481	op->contr->do_los = 1;	1416	op->contr->do_los = 1;
		1417	++op->map->players;
		1418	op->map->touch ();
		1419	}
1482		1420
1483	/* If we have a floor, we know the player, if any, will be above	1421	op->map->dirty = true;
1484	* it, so save a few ticks and start from there.	1422
1485	*/	1423	if (object *pl = ms.player ())
1486	if (!(flag & INS_MAP_LOAD))	1424	pl->contr->ns->floorbox_update ();
1487	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1488	if (tmp->type == PLAYER)
1489	tmp->contr->socket.update_look = 1;
1490		1425
1491	/* If this object glows, it may affect lighting conditions that are	1426	/* If this object glows, it may affect lighting conditions that are
1492	* visible to others on this map. But update_all_los is really	1427	* visible to others on this map. But update_all_los is really
1493	* an inefficient way to do this, as it means los for all players	1428	* an inefficient way to do this, as it means los for all players
1494	* on the map will get recalculated. The players could very well	1429	* on the map will get recalculated. The players could very well
1495	* be far away from this change and not affected in any way -	1430	* be far away from this change and not affected in any way -
1496	* this should get redone to only look for players within range,	1431	* this should get redone to only look for players within range,
1497	* or just updating the P_NEED_UPDATE for spaces within this area	1432	* or just updating the P_UPTODATE for spaces within this area
1498	* of effect may be sufficient.	1433	* of effect may be sufficient.
1499	*/	1434	*/
1500	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1435	if (op->map->darkness && (op->glow_radius != 0))
1501	update_all_los (op->map, op->x, op->y);	1436	update_all_los (op->map, op->x, op->y);
1502		1437
1503	/* updates flags (blocked, alive, no magic, etc) for this map space */	1438	/* updates flags (blocked, alive, no magic, etc) for this map space */
1504	update_object (op, UP_OBJ_INSERT);	1439	update_object (op, UP_OBJ_INSERT);
1505		1440
		1441	INVOKE_OBJECT (INSERT, op);
		1442
1506	/* Don't know if moving this to the end will break anything. However,	1443	/* Don't know if moving this to the end will break anything. However,
1507	* we want to have update_look set above before calling this.	1444	* we want to have floorbox_update called before calling this.
1508	*	1445	*
1509	* check_move_on() must be after this because code called from	1446	* check_move_on() must be after this because code called from
1510	* check_move_on() depends on correct map flags (so functions like	1447	* check_move_on() depends on correct map flags (so functions like
1511	* blocked() and wall() work properly), and these flags are updated by	1448	* blocked() and wall() work properly), and these flags are updated by
1512	* update_object().	1449	* update_object().
1513	*/	1450	*/
1514		1451
1515	/* if this is not the head or flag has been passed, don't check walk on status */	1452	/* if this is not the head or flag has been passed, don't check walk on status */
1516	if (!(flag & INS_NO_WALK_ON) && !op->head)	1453	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1517	{	1454	{
1518	if (check_move_on (op, originator))	1455	if (check_move_on (op, originator))
1519	return NULL;	1456	return 0;
1520		1457
1521	/* If we are a multi part object, lets work our way through the check	1458	/* If we are a multi part object, lets work our way through the check
1522	* walk on's.	1459	* walk on's.
1523	*/	1460	*/
1524	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1461	for (object *tmp = op->more; tmp; tmp = tmp->more)
1525	if (check_move_on (tmp, originator))	1462	if (check_move_on (tmp, originator))
1526	return NULL;	1463	return 0;
1527	}	1464	}
1528		1465
1529	return op;	1466	return op;
1530	}	1467	}
1531		1468
1532	/* this function inserts an object in the map, but if it	1469	/* this function inserts an object in the map, but if it
1533	* finds an object of its own type, it'll remove that one first.	1470	* finds an object of its own type, it'll remove that one first.
1534	* op is the object to insert it under: supplies x and the map.	1471	* op is the object to insert it under: supplies x and the map.
1535	*/	1472	*/
1536	void	1473	void
1537	replace_insert_ob_in_map (const char *arch_string, object *op)	1474	replace_insert_ob_in_map (const char *arch_string, object *op)
1538	{	1475	{
1539	object *
1540	tmp;
1541	object *
1542	tmp1;
1543
1544	/* first search for itself and remove any old instances */	1476	/* first search for itself and remove any old instances */
1545		1477
1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1478	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1479	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1548	tmp->destroy ();	1480	tmp->destroy (1);
1549		1481
1550	tmp1 = arch_to_object (archetype::find (arch_string));	1482	object *tmp = arch_to_object (archetype::find (arch_string));
1551		1483
1552	tmp1->x = op->x;	1484	tmp->x = op->x;
1553	tmp1->y = op->y;	1485	tmp->y = op->y;
		1486
1554	insert_ob_in_map (tmp1, op->map, op, 0);	1487	insert_ob_in_map (tmp, op->map, op, 0);
1555	}	1488	}
1556
1557	/*
1558	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1559	* is returned contains nr objects, and the remaining parts contains
1560	* the rest (or is removed and freed if that number is 0).
1561	* On failure, NULL is returned, and the reason put into the
1562	* global static errmsg array.
1563	*/
1564		1489
1565	object *	1490	object *
1566	get_split_ob (object *orig_ob, uint32 nr)	1491	object::insert_at (object *where, object *originator, int flags)
1567	{	1492	{
1568	object *newob;	1493	if (where->env)
1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1494	return where->env->insert (this);
		1495	else
		1496	return where->map->insert (this, where->x, where->y, originator, flags);
		1497	}
1570		1498
1571	if (orig_ob->nrof < nr)	1499	// find player who can see this object
1572	{	1500	object *
1573	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1501	object::visible_to () const
1574	return NULL;	1502	{
		1503	if (!flag [FLAG_REMOVED])
1575	}	1504	{
1576		1505	// see if we are in a container of sorts
1577	newob = object_create_clone (orig_ob);	1506	if (env)
1578
1579	if ((orig_ob->nrof -= nr) < 1)
1580	orig_ob->destroy (1);
1581	else if (!is_removed)
1582	{
1583	if (orig_ob->env != NULL)
1584	sub_weight (orig_ob->env, orig_ob->weight * nr);
1585	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1586	{
1587	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1588	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1589	return NULL;
1590	}	1507	{
1591	}	1508	// the player inventory itself is always visible
		1509	if (env->type == PLAYER)
		1510	return env;
1592		1511
1593	newob->nrof = nr;	1512	// else a player could have our env open
		1513	object *envest = env->outer_env ();
1594		1514
		1515	// the player itself is always on a map, so we will find him here
		1516	// even if our inv is in a player.
		1517	if (envest->is_on_map ())
		1518	if (object *pl = envest->ms ().player ())
		1519	if (pl->container == env)
		1520	return pl;
		1521	}
		1522	else
		1523	{
		1524	// maybe there is a player standing on the same mapspace
		1525	// this will catch the case where "this" is a player
		1526	if (object *pl = ms ().player ())
		1527	return pl;
		1528	}
		1529	}
		1530
1595	return newob;	1531	return 0;
1596	}	1532	}
1597		1533
1598	/*	1534	/*
1599	* decrease_ob_nr(object, number) decreases a specified number from	1535	* decrease(object, number) decreases a specified number from
1600	* the amount of an object. If the amount reaches 0, the object	1536	* the amount of an object. If the amount reaches 0, the object
1601	* is subsequently removed and freed.	1537	* is subsequently removed and freed.
1602	*	1538	*
1603	* Return value: 'op' if something is left, NULL if the amount reached 0	1539	* Return value: 'op' if something is left, NULL if the amount reached 0
1604	*/	1540	*/
		1541	bool
		1542	object::decrease (sint32 nr)
		1543	{
		1544	if (!nr)
		1545	return true;
1605		1546
		1547	nr = min (nr, nrof);
		1548
		1549	nrof -= nr;
		1550
		1551	if (nrof)
		1552	{
		1553	adjust_weight (env, -weight * nr); // carrying == 0
		1554
		1555	if (object *pl = visible_to ())
		1556	esrv_update_item (UPD_NROF, pl, this);
		1557
		1558	return true;
		1559	}
		1560	else
		1561	{
		1562	destroy (1);
		1563	return false;
		1564	}
		1565	}
		1566
		1567	/*
		1568	* split(ob,nr) splits up ob into two parts. The part which
		1569	* is returned contains nr objects, and the remaining parts contains
		1570	* the rest (or is removed and returned if that number is 0).
		1571	* On failure, NULL is returned.
		1572	*/
1606	object *	1573	object *
1607	decrease_ob_nr (object *op, uint32 i)	1574	object::split (sint32 nr)
1608	{	1575	{
1609	object *tmp;	1576	int have = number_of ();
1610	player *pl;
1611		1577
1612	if (i == 0) /* objects with op->nrof require this check */	1578	if (have < nr)
1613	return op;	1579	return 0;
1614		1580	else if (have == nr)
1615	if (i > op->nrof)
1616	i = op->nrof;
1617
1618	if (QUERY_FLAG (op, FLAG_REMOVED))
1619	op->nrof -= i;
1620	else if (op->env != NULL)
1621	{	1581	{
1622	/* is this object in the players inventory, or sub container
1623	* therein?
1624	*/
1625	tmp = is_player_inv (op->env);
1626	/* nope. Is this a container the player has opened?
1627	* If so, set tmp to that player.
1628	* IMO, searching through all the players will mostly
1629	* likely be quicker than following op->env to the map,
1630	* and then searching the map for a player.
1631	*/
1632	if (!tmp)
1633	{
1634	for (pl = first_player; pl; pl = pl->next)
1635	if (pl->ob->container == op->env)
1636	break;
1637	if (pl)
1638	tmp = pl->ob;
1639	else
1640	tmp = NULL;
1641	}
1642
1643	if (i < op->nrof)
1644	{
1645	sub_weight (op->env, op->weight * i);
1646	op->nrof -= i;
1647	if (tmp)
1648	{
1649	esrv_send_item (tmp, op);
1650	}
1651	}
1652	else
1653	{
1654	op->remove ();	1582	remove ();
1655	op->nrof = 0;	1583	return this;
1656	if (tmp)
1657	{
1658	esrv_del_item (tmp->contr, op->count);
1659	}
1660	}
1661	}	1584	}
1662	else	1585	else
1663	{	1586	{
1664	object *above = op->above;	1587	decrease (nr);
1665		1588
1666	if (i < op->nrof)	1589	object *op = object_create_clone (this);
1667	op->nrof -= i;	1590	op->nrof = nr;
1668	else
1669	{
1670	op->remove ();
1671	op->nrof = 0;
1672	}
1673
1674	/* Since we just removed op, op->above is null */
1675	for (tmp = above; tmp != NULL; tmp = tmp->above)
1676	if (tmp->type == PLAYER)
1677	{
1678	if (op->nrof)
1679	esrv_send_item (tmp, op);
1680	else
1681	esrv_del_item (tmp->contr, op->count);
1682	}
1683	}
1684
1685	if (op->nrof)
1686	return op;	1591	return op;
1687	else
1688	{
1689	op->destroy ();
1690	return NULL;
1691	}
1692	}
1693
1694	/*
1695	* add_weight(object, weight) adds the specified weight to an object,
1696	* and also updates how much the environment(s) is/are carrying.
1697	*/
1698
1699	void
1700	add_weight (object *op, signed long weight)
1701	{
1702	while (op != NULL)
1703	{
1704	if (op->type == CONTAINER)
1705	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1706
1707	op->carrying += weight;
1708	op = op->env;
1709	}	1592	}
1710	}	1593	}
1711		1594
1712	object *	1595	object *
1713	insert_ob_in_ob (object *op, object *where)	1596	insert_ob_in_ob (object *op, object *where)
…		…
1718	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1601	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1719	free (dump);	1602	free (dump);
1720	return op;	1603	return op;
1721	}	1604	}
1722		1605
1723	if (where->head)	1606	if (where->head_ () != where)
1724	{	1607	{
1725	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1608	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1726	where = where->head;	1609	where = where->head;
1727	}	1610	}
1728		1611
1729	return where->insert (op);	1612	return where->insert (op);
1730	}	1613	}
…		…
1735	* inside the object environment.	1618	* inside the object environment.
1736	*	1619	*
1737	* The function returns now pointer to inserted item, and return value can	1620	* The function returns now pointer to inserted item, and return value can
1738	* be != op, if items are merged. -Tero	1621	* be != op, if items are merged. -Tero
1739	*/	1622	*/
1740
1741	object *	1623	object *
1742	object::insert (object *op)	1624	object::insert (object *op)
1743	{	1625	{
1744	object *tmp, *otmp;
1745
1746	if (!QUERY_FLAG (op, FLAG_REMOVED))
1747	op->remove ();
1748
1749	if (op->more)	1626	if (op->more)
1750	{	1627	{
1751	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1628	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1752	return op;	1629	return op;
1753	}	1630	}
1754		1631
1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1632	op->remove ();
1756	CLEAR_FLAG (op, FLAG_REMOVED);	1633
		1634	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1635
1757	if (op->nrof)	1636	if (op->nrof)
1758	{
1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1637	for (object *tmp = inv; tmp; tmp = tmp->below)
1760	if (CAN_MERGE (tmp, op))	1638	if (object::can_merge (tmp, op))
1761	{	1639	{
1762	/* return the original object and remove inserted object	1640	/* return the original object and remove inserted object
1763	(client needs the original object) */	1641	(client needs the original object) */
1764	tmp->nrof += op->nrof;	1642	tmp->nrof += op->nrof;
1765	/* Weight handling gets pretty funky. Since we are adding to
1766	* tmp->nrof, we need to increase the weight.
1767	*/
1768	add_weight (this, op->weight * op->nrof);	1643	adjust_weight (this, op->total_weight ());
1769	SET_FLAG (op, FLAG_REMOVED);	1644
1770	op->destroy (); /* free the inserted object */	1645	op->destroy (1);
1771	op = tmp;	1646	op = tmp;
1772	op->remove (); /* and fix old object's links */	1647	goto inserted;
1773	CLEAR_FLAG (op, FLAG_REMOVED);
1774	break;
1775	}	1648	}
1776		1649
1777	/* I assume combined objects have no inventory	1650	op->owner = 0; // it's his/hers now. period.
1778	* We add the weight - this object could have just been removed
1779	* (if it was possible to merge). calling remove_ob will subtract
1780	* the weight, so we need to add it in again, since we actually do
1781	* the linking below
1782	*/
1783	add_weight (this, op->weight * op->nrof);
1784	}
1785	else
1786	add_weight (this, (op->weight + op->carrying));
1787
1788	otmp = is_player_inv (this);
1789	if (otmp && otmp->contr)
1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1791	fix_player (otmp);
1792
1793	op->map = NULL;	1651	op->map = 0;
		1652	op->x = 0;
		1653	op->y = 0;
		1654
		1655	op->above = 0;
		1656	op->below = inv;
1794	op->env = this;	1657	op->env = this;
1795	op->above = NULL;
1796	op->below = NULL;
1797	op->x = 0, op->y = 0;
1798		1658
		1659	if (inv)
		1660	inv->above = op;
		1661
		1662	inv = op;
		1663
		1664	op->flag [FLAG_REMOVED] = 0;
		1665
		1666	adjust_weight (this, op->total_weight ());
		1667
		1668	inserted:
1799	/* reset the light list and los of the players on the map */	1669	/* reset the light list and los of the players on the map */
1800	if ((op->glow_radius != 0) && map)	1670	if (op->glow_radius && map && map->darkness)
1801	{
1802	#ifdef DEBUG_LIGHTS
1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1804	#endif /* DEBUG_LIGHTS */
1805	if (MAP_DARKNESS (map))
1806	update_all_los (map, x, y);	1671	update_all_los (map, x, y);
1807	}
1808		1672
1809	/* Client has no idea of ordering so lets not bother ordering it here.	1673	if (object *otmp = in_player ())
1810	* It sure simplifies this function...	1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1811	*/	1675	otmp->update_stats ();
1812	if (!inv)	1676
1813	inv = op;	1677	INVOKE_OBJECT (INSERT, this);
1814	else
1815	{
1816	op->below = inv;
1817	op->below->above = op;
1818	inv = op;
1819	}
1820		1678
1821	return op;	1679	return op;
1822	}	1680	}
1823		1681
1824	/*	1682	/*
…		…
1839	*	1697	*
1840	* MSW 2001-07-08: Check all objects on space, not just those below	1698	* MSW 2001-07-08: Check all objects on space, not just those below
1841	* object being inserted. insert_ob_in_map may not put new objects	1699	* object being inserted. insert_ob_in_map may not put new objects
1842	* on top.	1700	* on top.
1843	*/	1701	*/
1844
1845	int	1702	int
1846	check_move_on (object *op, object *originator)	1703	check_move_on (object *op, object *originator)
1847	{	1704	{
1848	object *tmp;	1705	object *tmp;
1849	maptile *m = op->map;	1706	maptile *m = op->map;
…		…
1876		1733
1877	/* The objects have to be checked from top to bottom.	1734	/* The objects have to be checked from top to bottom.
1878	* Hence, we first go to the top:	1735	* Hence, we first go to the top:
1879	*/	1736	*/
1880		1737
1881	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1738	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1882	{	1739	{
1883	/* Trim the search when we find the first other spell effect	1740	/* Trim the search when we find the first other spell effect
1884	* this helps performance so that if a space has 50 spell objects,	1741	* this helps performance so that if a space has 50 spell objects,
1885	* we don't need to check all of them.	1742	* we don't need to check all of them.
1886	*/	1743	*/
…		…
1904	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1761	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1905	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1762	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1906	{	1763	{
1907		1764
1908	float	1765	float
1909	diff = tmp->move_slow_penalty * FABS (op->speed);	1766	diff = tmp->move_slow_penalty * fabs (op->speed);
1910		1767
1911	if (op->type == PLAYER)	1768	if (op->type == PLAYER)
1912	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1769	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1913	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1770	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1914	diff /= 4.0;	1771	diff /= 4.0;
…		…
1941	/*	1798	/*
1942	* present_arch(arch, map, x, y) searches for any objects with	1799	* present_arch(arch, map, x, y) searches for any objects with
1943	* a matching archetype at the given map and coordinates.	1800	* a matching archetype at the given map and coordinates.
1944	* The first matching object is returned, or NULL if none.	1801	* The first matching object is returned, or NULL if none.
1945	*/	1802	*/
1946
1947	object *	1803	object *
1948	present_arch (const archetype *at, maptile *m, int x, int y)	1804	present_arch (const archetype *at, maptile *m, int x, int y)
1949	{	1805	{
1950	object *
1951	tmp;
1952
1953	if (m == NULL || out_of_map (m, x, y))	1806	if (!m || out_of_map (m, x, y))
1954	{	1807	{
1955	LOG (llevError, "Present_arch called outside map.\n");	1808	LOG (llevError, "Present_arch called outside map.\n");
1956	return NULL;	1809	return NULL;
1957	}	1810	}
1958	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1811
		1812	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1959	if (tmp->arch == at)	1813	if (tmp->arch == at)
1960	return tmp;	1814	return tmp;
		1815
1961	return NULL;	1816	return NULL;
1962	}	1817	}
1963		1818
1964	/*	1819	/*
1965	* present(type, map, x, y) searches for any objects with	1820	* present(type, map, x, y) searches for any objects with
1966	* a matching type variable at the given map and coordinates.	1821	* a matching type variable at the given map and coordinates.
1967	* The first matching object is returned, or NULL if none.	1822	* The first matching object is returned, or NULL if none.
1968	*/	1823	*/
1969
1970	object *	1824	object *
1971	present (unsigned char type, maptile *m, int x, int y)	1825	present (unsigned char type, maptile *m, int x, int y)
1972	{	1826	{
1973	object *
1974	tmp;
1975
1976	if (out_of_map (m, x, y))	1827	if (out_of_map (m, x, y))
1977	{	1828	{
1978	LOG (llevError, "Present called outside map.\n");	1829	LOG (llevError, "Present called outside map.\n");
1979	return NULL;	1830	return NULL;
1980	}	1831	}
1981	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1832
		1833	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1982	if (tmp->type == type)	1834	if (tmp->type == type)
1983	return tmp;	1835	return tmp;
		1836
1984	return NULL;	1837	return NULL;
1985	}	1838	}
1986		1839
1987	/*	1840	/*
1988	* present_in_ob(type, object) searches for any objects with	1841	* present_in_ob(type, object) searches for any objects with
1989	* a matching type variable in the inventory of the given object.	1842	* a matching type variable in the inventory of the given object.
1990	* The first matching object is returned, or NULL if none.	1843	* The first matching object is returned, or NULL if none.
1991	*/	1844	*/
1992
1993	object *	1845	object *
1994	present_in_ob (unsigned char type, const object *op)	1846	present_in_ob (unsigned char type, const object *op)
1995	{	1847	{
1996	object *
1997	tmp;
1998
1999	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1848	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2000	if (tmp->type == type)	1849	if (tmp->type == type)
2001	return tmp;	1850	return tmp;
		1851
2002	return NULL;	1852	return NULL;
2003	}	1853	}
2004		1854
2005	/*	1855	/*
2006	* present_in_ob (type, str, object) searches for any objects with	1856	* present_in_ob (type, str, object) searches for any objects with
…		…
2014	* str is the string to match against. Note that we match against	1864	* str is the string to match against. Note that we match against
2015	* the object name, not the archetype name. this is so that the	1865	* the object name, not the archetype name. this is so that the
2016	* spell code can use one object type (force), but change it's name	1866	* spell code can use one object type (force), but change it's name
2017	* to be unique.	1867	* to be unique.
2018	*/	1868	*/
2019
2020	object *	1869	object *
2021	present_in_ob_by_name (int type, const char *str, const object *op)	1870	present_in_ob_by_name (int type, const char *str, const object *op)
2022	{	1871	{
2023	object *
2024	tmp;
2025
2026	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1872	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2027	{
2028	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1873	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2029	return tmp;	1874	return tmp;
2030	}	1875
2031	return NULL;	1876	return 0;
2032	}	1877	}
2033		1878
2034	/*	1879	/*
2035	* present_arch_in_ob(archetype, object) searches for any objects with	1880	* present_arch_in_ob(archetype, object) searches for any objects with
2036	* a matching archetype in the inventory of the given object.	1881	* a matching archetype in the inventory of the given object.
2037	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2038	*/	1883	*/
2039
2040	object *	1884	object *
2041	present_arch_in_ob (const archetype *at, const object *op)	1885	present_arch_in_ob (const archetype *at, const object *op)
2042	{	1886	{
2043	object *
2044	tmp;
2045
2046	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1887	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047	if (tmp->arch == at)	1888	if (tmp->arch == at)
2048	return tmp;	1889	return tmp;
		1890
2049	return NULL;	1891	return NULL;
2050	}	1892	}
2051		1893
2052	/*	1894	/*
2053	* activate recursively a flag on an object inventory	1895	* activate recursively a flag on an object inventory
2054	*/	1896	*/
2055	void	1897	void
2056	flag_inv (object *op, int flag)	1898	flag_inv (object *op, int flag)
2057	{	1899	{
2058	object *
2059	tmp;
2060
2061	if (op->inv)
2062	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1900	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2063	{	1901	{
2064	SET_FLAG (tmp, flag);	1902	SET_FLAG (tmp, flag);
2065	flag_inv (tmp, flag);	1903	flag_inv (tmp, flag);
2066	}	1904	}
2067	} /*	1905	}
		1906
		1907	/*
2068	* desactivate recursively a flag on an object inventory	1908	* deactivate recursively a flag on an object inventory
2069	*/	1909	*/
2070	void	1910	void
2071	unflag_inv (object *op, int flag)	1911	unflag_inv (object *op, int flag)
2072	{	1912	{
2073	object *
2074	tmp;
2075
2076	if (op->inv)
2077	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1913	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2078	{	1914	{
2079	CLEAR_FLAG (tmp, flag);	1915	CLEAR_FLAG (tmp, flag);
2080	unflag_inv (tmp, flag);	1916	unflag_inv (tmp, flag);
2081	}	1917	}
2082	}
2083
2084	/*
2085	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2086	* all it's inventory (recursively).
2087	* If checksums are used, a player will get set_cheat called for
2088	* him/her-self and all object carried by a call to this function.
2089	*/
2090
2091	void
2092	set_cheat (object *op)
2093	{
2094	SET_FLAG (op, FLAG_WAS_WIZ);
2095	flag_inv (op, FLAG_WAS_WIZ);
2096	}	1918	}
2097		1919
2098	/*	1920	/*
2099	* find_free_spot(object, map, x, y, start, stop) will search for	1921	* find_free_spot(object, map, x, y, start, stop) will search for
2100	* a spot at the given map and coordinates which will be able to contain	1922	* a spot at the given map and coordinates which will be able to contain
…		…
2102	* to search (see the freearr_x/y[] definition).	1924	* to search (see the freearr_x/y[] definition).
2103	* It returns a random choice among the alternatives found.	1925	* It returns a random choice among the alternatives found.
2104	* start and stop are where to start relative to the free_arr array (1,9	1926	* start and stop are where to start relative to the free_arr array (1,9
2105	* does all 4 immediate directions). This returns the index into the	1927	* does all 4 immediate directions). This returns the index into the
2106	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1928	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2107	* Note - this only checks to see if there is space for the head of the
2108	* object - if it is a multispace object, this should be called for all
2109	* pieces.
2110	* Note2: This function does correctly handle tiled maps, but does not	1929	* Note: This function does correctly handle tiled maps, but does not
2111	* inform the caller. However, insert_ob_in_map will update as	1930	* inform the caller. However, insert_ob_in_map will update as
2112	* necessary, so the caller shouldn't need to do any special work.	1931	* necessary, so the caller shouldn't need to do any special work.
2113	* Note - updated to take an object instead of archetype - this is necessary	1932	* Note - updated to take an object instead of archetype - this is necessary
2114	* because arch_blocked (now ob_blocked) needs to know the movement type	1933	* because arch_blocked (now ob_blocked) needs to know the movement type
2115	* to know if the space in question will block the object. We can't use	1934	* to know if the space in question will block the object. We can't use
2116	* the archetype because that isn't correct if the monster has been	1935	* the archetype because that isn't correct if the monster has been
2117	* customized, changed states, etc.	1936	* customized, changed states, etc.
2118	*/	1937	*/
2119
2120	int	1938	int
2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1939	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2122	{	1940	{
2123	int
2124	i,
2125	index = 0, flag;
2126	static int
2127	altern[SIZEOFFREE];	1941	int altern[SIZEOFFREE];
		1942	int index = 0, flag;
2128		1943
2129	for (i = start; i < stop; i++)	1944	for (int i = start; i < stop; i++)
2130	{	1945	{
2131	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1946	mapxy pos (m, x, y); pos.move (i);
2132	if (!flag)	1947
		1948	if (!pos.normalise ())
		1949	continue;
		1950
		1951	mapspace &ms = *pos;
		1952
		1953	if (ms.flags () & P_IS_ALIVE)
		1954	continue;
		1955
		1956	/* However, often
		1957	* ob doesn't have any move type (when used to place exits)
		1958	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1959	*/
		1960	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1961	{
2133	altern[index++] = i;	1962	altern [index++] = i;
		1963	continue;
		1964	}
2134		1965
2135	/* Basically, if we find a wall on a space, we cut down the search size.	1966	/* Basically, if we find a wall on a space, we cut down the search size.
2136	* In this way, we won't return spaces that are on another side of a wall.	1967	* In this way, we won't return spaces that are on another side of a wall.
2137	* This mostly work, but it cuts down the search size in all directions -	1968	* This mostly work, but it cuts down the search size in all directions -
2138	* if the space being examined only has a wall to the north and empty	1969	* if the space being examined only has a wall to the north and empty
2139	* spaces in all the other directions, this will reduce the search space	1970	* spaces in all the other directions, this will reduce the search space
2140	* to only the spaces immediately surrounding the target area, and	1971	* to only the spaces immediately surrounding the target area, and
2141	* won't look 2 spaces south of the target space.	1972	* won't look 2 spaces south of the target space.
2142	*/	1973	*/
2143	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1974	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1975	{
2144	stop = maxfree[i];	1976	stop = maxfree[i];
		1977	continue;
		1978	}
		1979
		1980	/* Note it is intentional that we check ob - the movement type of the
		1981	* head of the object should correspond for the entire object.
		1982	*/
		1983	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1984	continue;
		1985
		1986	if (ob->blocked (m, pos.x, pos.y))
		1987	continue;
		1988
		1989	altern [index++] = i;
2145	}	1990	}
		1991
2146	if (!index)	1992	if (!index)
2147	return -1;	1993	return -1;
		1994
2148	return altern[RANDOM () % index];	1995	return altern [rndm (index)];
2149	}	1996	}
2150		1997
2151	/*	1998	/*
2152	* find_first_free_spot(archetype, maptile, x, y) works like	1999	* find_first_free_spot(archetype, maptile, x, y) works like
2153	* find_free_spot(), but it will search max number of squares.	2000	* find_free_spot(), but it will search max number of squares.
2154	* But it will return the first available spot, not a random choice.	2001	* But it will return the first available spot, not a random choice.
2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2002	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2156	*/	2003	*/
2157
2158	int	2004	int
2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2005	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2160	{	2006	{
2161	int
2162	i;
2163
2164	for (i = 0; i < SIZEOFFREE; i++)	2007	for (int i = 0; i < SIZEOFFREE; i++)
2165	{
2166	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2008	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2167	return i;	2009	return i;
2168	}	2010
2169	return -1;	2011	return -1;
2170	}	2012	}
2171		2013
2172	/*	2014	/*
2173	* The function permute(arr, begin, end) randomly reorders the array	2015	* The function permute(arr, begin, end) randomly reorders the array
2174	* arr[begin..end-1].	2016	* arr[begin..end-1].
		2017	* now uses a fisher-yates shuffle, old permute was broken
2175	*/	2018	*/
2176	static void	2019	static void
2177	permute (int *arr, int begin, int end)	2020	permute (int *arr, int begin, int end)
2178	{	2021	{
2179	int	2022	arr += begin;
2180	i,
2181	j,
2182	tmp,
2183	len;
2184
2185	len = end - begin;	2023	end -= begin;
2186	for (i = begin; i < end; i++)
2187	{
2188	j = begin + RANDOM () % len;
2189		2024
2190	tmp = arr[i];	2025	while (--end)
2191	arr[i] = arr[j];	2026	swap (arr [end], arr [rndm (end + 1)]);
2192	arr[j] = tmp;
2193	}
2194	}	2027	}
2195		2028
2196	/* new function to make monster searching more efficient, and effective!	2029	/* new function to make monster searching more efficient, and effective!
2197	* This basically returns a randomized array (in the passed pointer) of	2030	* This basically returns a randomized array (in the passed pointer) of
2198	* the spaces to find monsters. In this way, it won't always look for	2031	* the spaces to find monsters. In this way, it won't always look for
…		…
2201	* the 3x3 area will be searched, just not in a predictable order.	2034	* the 3x3 area will be searched, just not in a predictable order.
2202	*/	2035	*/
2203	void	2036	void
2204	get_search_arr (int *search_arr)	2037	get_search_arr (int *search_arr)
2205	{	2038	{
2206	int	2039	int i;
2207	i;
2208		2040
2209	for (i = 0; i < SIZEOFFREE; i++)	2041	for (i = 0; i < SIZEOFFREE; i++)
2210	{
2211	search_arr[i] = i;	2042	search_arr[i] = i;
2212	}
2213		2043
2214	permute (search_arr, 1, SIZEOFFREE1 + 1);	2044	permute (search_arr, 1, SIZEOFFREE1 + 1);
2215	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2045	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2216	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2046	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2217	}	2047	}
…		…
2226	* Perhaps incorrectly, but I'm making the assumption that exclude	2056	* Perhaps incorrectly, but I'm making the assumption that exclude
2227	* is actually want is going to try and move there. We need this info	2057	* is actually want is going to try and move there. We need this info
2228	* because we have to know what movement the thing looking to move	2058	* because we have to know what movement the thing looking to move
2229	* there is capable of.	2059	* there is capable of.
2230	*/	2060	*/
2231
2232	int	2061	int
2233	find_dir (maptile *m, int x, int y, object *exclude)	2062	find_dir (maptile *m, int x, int y, object *exclude)
2234	{	2063	{
2235	int
2236	i,
2237	max = SIZEOFFREE, mflags;	2064	int i, max = SIZEOFFREE, mflags;
2238		2065
2239	sint16 nx, ny;	2066	sint16 nx, ny;
2240	object *	2067	object *tmp;
2241	tmp;
2242	maptile *	2068	maptile *mp;
2243	mp;
2244		2069
2245	MoveType blocked, move_type;	2070	MoveType blocked, move_type;
2246		2071
2247	if (exclude && exclude->head)	2072	if (exclude && exclude->head_ () != exclude)
2248	{	2073	{
2249	exclude = exclude->head;	2074	exclude = exclude->head;
2250	move_type = exclude->move_type;	2075	move_type = exclude->move_type;
2251	}	2076	}
2252	else	2077	else
…		…
2260	mp = m;	2085	mp = m;
2261	nx = x + freearr_x[i];	2086	nx = x + freearr_x[i];
2262	ny = y + freearr_y[i];	2087	ny = y + freearr_y[i];
2263		2088
2264	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2089	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2090
2265	if (mflags & P_OUT_OF_MAP)	2091	if (mflags & P_OUT_OF_MAP)
2266	{
2267	max = maxfree[i];	2092	max = maxfree[i];
2268	}
2269	else	2093	else
2270	{	2094	{
2271	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2095	mapspace &ms = mp->at (nx, ny);
		2096
		2097	blocked = ms.move_block;
2272		2098
2273	if ((move_type & blocked) == move_type)	2099	if ((move_type & blocked) == move_type)
2274	{
2275	max = maxfree[i];	2100	max = maxfree[i];
2276	}
2277	else if (mflags & P_IS_ALIVE)	2101	else if (mflags & P_IS_ALIVE)
2278	{	2102	{
2279	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2103	for (tmp = ms.bot; tmp; tmp = tmp->above)
2280	{	2104	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2281	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2105	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2282	{
2283	break;	2106	break;
2284	}	2107
2285	}
2286	if (tmp)	2108	if (tmp)
2287	{
2288	return freedir[i];	2109	return freedir[i];
2289	}
2290	}	2110	}
2291	}	2111	}
2292	}	2112	}
		2113
2293	return 0;	2114	return 0;
2294	}	2115	}
2295		2116
2296	/*	2117	/*
2297	* distance(object 1, object 2) will return the square of the	2118	* distance(object 1, object 2) will return the square of the
2298	* distance between the two given objects.	2119	* distance between the two given objects.
2299	*/	2120	*/
2300
2301	int	2121	int
2302	distance (const object *ob1, const object *ob2)	2122	distance (const object *ob1, const object *ob2)
2303	{	2123	{
2304	int
2305	i;
2306
2307	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2124	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2308	return i;
2309	}	2125	}
2310		2126
2311	/*	2127	/*
2312	* find_dir_2(delta-x,delta-y) will return a direction in which	2128	* find_dir_2(delta-x,delta-y) will return a direction in which
2313	* an object which has subtracted the x and y coordinates of another	2129	* an object which has subtracted the x and y coordinates of another
2314	* object, needs to travel toward it.	2130	* object, needs to travel toward it.
2315	*/	2131	*/
2316
2317	int	2132	int
2318	find_dir_2 (int x, int y)	2133	find_dir_2 (int x, int y)
2319	{	2134	{
2320	int	2135	int q;
2321	q;
2322		2136
2323	if (y)	2137	if (y)
2324	q = x * 100 / y;	2138	q = x * 100 / y;
2325	else if (x)	2139	else if (x)
2326	q = -300 * x;	2140	q = -300 * x;
…		…
2351		2165
2352	return 3;	2166	return 3;
2353	}	2167	}
2354		2168
2355	/*	2169	/*
2356	* absdir(int): Returns a number between 1 and 8, which represent
2357	* the "absolute" direction of a number (it actually takes care of
2358	* "overflow" in previous calculations of a direction).
2359	*/
2360
2361	int
2362	absdir (int d)
2363	{
2364	while (d < 1)
2365	d += 8;
2366	while (d > 8)
2367	d -= 8;
2368	return d;
2369	}
2370
2371	/*
2372	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2170	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2373	* between two directions (which are expected to be absolute (see absdir())	2171	* between two directions (which are expected to be absolute (see absdir())
2374	*/	2172	*/
2375
2376	int	2173	int
2377	dirdiff (int dir1, int dir2)	2174	dirdiff (int dir1, int dir2)
2378	{	2175	{
2379	int	2176	int d;
2380	d;
2381		2177
2382	d = abs (dir1 - dir2);	2178	d = abs (dir1 - dir2);
2383	if (d > 4)	2179	if (d > 4)
2384	d = 8 - d;	2180	d = 8 - d;
		2181
2385	return d;	2182	return d;
2386	}	2183	}
2387		2184
2388	/* peterm:	2185	/* peterm:
2389	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2186	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2392	* This basically means that if direction is 15, then it could either go	2189	* This basically means that if direction is 15, then it could either go
2393	* direction 4, 14, or 16 to get back to where we are.	2190	* direction 4, 14, or 16 to get back to where we are.
2394	* Moved from spell_util.c to object.c with the other related direction	2191	* Moved from spell_util.c to object.c with the other related direction
2395	* functions.	2192	* functions.
2396	*/	2193	*/
2397
2398	int
2399	reduction_dir[SIZEOFFREE][3] = {	2194	int reduction_dir[SIZEOFFREE][3] = {
2400	{0, 0, 0}, /* 0 */	2195	{0, 0, 0}, /* 0 */
2401	{0, 0, 0}, /* 1 */	2196	{0, 0, 0}, /* 1 */
2402	{0, 0, 0}, /* 2 */	2197	{0, 0, 0}, /* 2 */
2403	{0, 0, 0}, /* 3 */	2198	{0, 0, 0}, /* 3 */
2404	{0, 0, 0}, /* 4 */	2199	{0, 0, 0}, /* 4 */
…		…
2452	* find a path to that monster that we found. If not,	2247	* find a path to that monster that we found. If not,
2453	* we don't bother going toward it. Returns 1 if we	2248	* we don't bother going toward it. Returns 1 if we
2454	* can see a direct way to get it	2249	* can see a direct way to get it
2455	* Modified to be map tile aware -.MSW	2250	* Modified to be map tile aware -.MSW
2456	*/	2251	*/
2457
2458
2459	int	2252	int
2460	can_see_monsterP (maptile *m, int x, int y, int dir)	2253	can_see_monsterP (maptile *m, int x, int y, int dir)
2461	{	2254	{
2462	sint16 dx, dy;	2255	sint16 dx, dy;
2463	int
2464	mflags;	2256	int mflags;
2465		2257
2466	if (dir < 0)	2258	if (dir < 0)
2467	return 0; /* exit condition: invalid direction */	2259	return 0; /* exit condition: invalid direction */
2468		2260
2469	dx = x + freearr_x[dir];	2261	dx = x + freearr_x[dir];
…		…
2482	return 0;	2274	return 0;
2483		2275
2484	/* yes, can see. */	2276	/* yes, can see. */
2485	if (dir < 9)	2277	if (dir < 9)
2486	return 1;	2278	return 1;
		2279
2487	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2280	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2488	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2281	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2282	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2489	}	2283	}
2490
2491
2492		2284
2493	/*	2285	/*
2494	* can_pick(picker, item): finds out if an object is possible to be	2286	* can_pick(picker, item): finds out if an object is possible to be
2495	* picked up by the picker. Returnes 1 if it can be	2287	* picked up by the picker. Returnes 1 if it can be
2496	* picked up, otherwise 0.	2288	* picked up, otherwise 0.
…		…
2498	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2290	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2499	* core dumps if they do.	2291	* core dumps if they do.
2500	*	2292	*
2501	* Add a check so we can't pick up invisible objects (0.93.8)	2293	* Add a check so we can't pick up invisible objects (0.93.8)
2502	*/	2294	*/
2503
2504	int	2295	int
2505	can_pick (const object *who, const object *item)	2296	can_pick (const object *who, const object *item)
2506	{	2297	{
2507	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2298	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2508	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2299	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2509	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2300	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2510	}	2301	}
2511		2302
2512
2513	/*	2303	/*
2514	* create clone from object to another	2304	* create clone from object to another
2515	*/	2305	*/
2516	object *	2306	object *
2517	object_create_clone (object *asrc)	2307	object_create_clone (object *asrc)
2518	{	2308	{
2519	object *dst = 0, *tmp, *src, *part, *prev, *item;	2309	object *dst = 0, *tmp, *src, *prev, *item;
2520		2310
2521	if (!asrc)	2311	if (!asrc)
2522	return 0;	2312	return 0;
2523		2313
2524	src = asrc;
2525	if (src->head)
2526	src = src->head;	2314	src = asrc->head_ ();
2527		2315
2528	prev = 0;	2316	prev = 0;
2529	for (part = src; part; part = part->more)	2317	for (object *part = src; part; part = part->more)
2530	{	2318	{
2531	tmp = part->clone ();	2319	tmp = part->clone ();
2532	tmp->x -= src->x;	2320	tmp->x -= src->x;
2533	tmp->y -= src->y;	2321	tmp->y -= src->y;
2534		2322
…		…
2536	{	2324	{
2537	dst = tmp;	2325	dst = tmp;
2538	tmp->head = 0;	2326	tmp->head = 0;
2539	}	2327	}
2540	else	2328	else
2541	{
2542	tmp->head = dst;	2329	tmp->head = dst;
2543	}
2544		2330
2545	tmp->more = 0;	2331	tmp->more = 0;
2546		2332
2547	if (prev)	2333	if (prev)
2548	prev->more = tmp;	2334	prev->more = tmp;
…		…
2552		2338
2553	for (item = src->inv; item; item = item->below)	2339	for (item = src->inv; item; item = item->below)
2554	insert_ob_in_ob (object_create_clone (item), dst);	2340	insert_ob_in_ob (object_create_clone (item), dst);
2555		2341
2556	return dst;	2342	return dst;
2557	}
2558
2559	/* GROS - Creates an object using a string representing its content. */
2560	/* Basically, we save the content of the string to a temp file, then call */
2561	/* load_object on it. I admit it is a highly inefficient way to make things, */
2562	/* but it was simple to make and allows reusing the load_object function. */
2563	/* Remember not to use load_object_str in a time-critical situation. */
2564	/* Also remember that multiparts objects are not supported for now. */
2565
2566	object *
2567	load_object_str (const char *obstr)
2568	{
2569	object *op;
2570	char filename[MAX_BUF];
2571
2572	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2573
2574	FILE *tempfile = fopen (filename, "w");
2575
2576	if (tempfile == NULL)
2577	{
2578	LOG (llevError, "Error - Unable to access load object temp file\n");
2579	return NULL;
2580	}
2581
2582	fprintf (tempfile, obstr);
2583	fclose (tempfile);
2584
2585	op = object::create ();
2586
2587	object_thawer thawer (filename);
2588
2589	if (thawer)
2590	load_object (thawer, op, 0);
2591
2592	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2593	CLEAR_FLAG (op, FLAG_REMOVED);
2594
2595	return op;
2596	}	2343	}
2597		2344
2598	/* This returns the first object in who's inventory that	2345	/* This returns the first object in who's inventory that
2599	* has the same type and subtype match.	2346	* has the same type and subtype match.
2600	* returns NULL if no match.	2347	* returns NULL if no match.
2601	*/	2348	*/
2602	object *	2349	object *
2603	find_obj_by_type_subtype (const object *who, int type, int subtype)	2350	find_obj_by_type_subtype (const object *who, int type, int subtype)
2604	{	2351	{
2605	object *tmp;
2606
2607	for (tmp = who->inv; tmp; tmp = tmp->below)	2352	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2608	if (tmp->type == type && tmp->subtype == subtype)	2353	if (tmp->type == type && tmp->subtype == subtype)
2609	return tmp;	2354	return tmp;
2610		2355
2611	return NULL;	2356	return 0;
2612	}	2357	}
2613		2358
2614	/* If ob has a field named key, return the link from the list,	2359	/* If ob has a field named key, return the link from the list,
2615	* otherwise return NULL.	2360	* otherwise return NULL.
2616	*	2361	*
…		…
2618	* do the desired thing.	2363	* do the desired thing.
2619	*/	2364	*/
2620	key_value *	2365	key_value *
2621	get_ob_key_link (const object *ob, const char *key)	2366	get_ob_key_link (const object *ob, const char *key)
2622	{	2367	{
2623	key_value *link;
2624
2625	for (link = ob->key_values; link != NULL; link = link->next)	2368	for (key_value *link = ob->key_values; link; link = link->next)
2626	if (link->key == key)	2369	if (link->key == key)
2627	return link;	2370	return link;
2628		2371
2629	return NULL;	2372	return 0;
2630	}	2373	}
2631		2374
2632	/*	2375	/*
2633	* Returns the value of op has an extra_field for key, or NULL.	2376	* Returns the value of op has an extra_field for key, or NULL.
2634	*	2377	*
…		…
2659	if (link->key == canonical_key)	2402	if (link->key == canonical_key)
2660	return link->value;	2403	return link->value;
2661		2404
2662	return 0;	2405	return 0;
2663	}	2406	}
2664
2665		2407
2666	/*	2408	/*
2667	* Updates the canonical_key in op to value.	2409	* Updates the canonical_key in op to value.
2668	*	2410	*
2669	* canonical_key is a shared string (value doesn't have to be).	2411	* canonical_key is a shared string (value doesn't have to be).
…		…
2674	* Returns TRUE on success.	2416	* Returns TRUE on success.
2675	*/	2417	*/
2676	int	2418	int
2677	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2419	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2678	{	2420	{
2679	key_value *
2680	field = NULL, *last = NULL;	2421	key_value *field = NULL, *last = NULL;
2681		2422
2682	for (field = op->key_values; field != NULL; field = field->next)	2423	for (field = op->key_values; field != NULL; field = field->next)
2683	{	2424	{
2684	if (field->key != canonical_key)	2425	if (field->key != canonical_key)
2685	{	2426	{
…		…
2694	/* Basically, if the archetype has this key set,	2435	/* Basically, if the archetype has this key set,
2695	* we need to store the null value so when we save	2436	* we need to store the null value so when we save
2696	* it, we save the empty value so that when we load,	2437	* it, we save the empty value so that when we load,
2697	* we get this value back again.	2438	* we get this value back again.
2698	*/	2439	*/
2699	if (get_ob_key_link (&op->arch->clone, canonical_key))	2440	if (get_ob_key_link (op->arch, canonical_key))
2700	field->value = 0;	2441	field->value = 0;
2701	else	2442	else
2702	{	2443	{
2703	if (last)	2444	if (last)
2704	last->next = field->next;	2445	last->next = field->next;
…		…
2713	/* IF we get here, key doesn't exist */	2454	/* IF we get here, key doesn't exist */
2714		2455
2715	/* No field, we'll have to add it. */	2456	/* No field, we'll have to add it. */
2716		2457
2717	if (!add_key)	2458	if (!add_key)
2718	{
2719	return FALSE;	2459	return FALSE;
2720	}	2460
2721	/* There isn't any good reason to store a null	2461	/* There isn't any good reason to store a null
2722	* value in the key/value list. If the archetype has	2462	* value in the key/value list. If the archetype has
2723	* this key, then we should also have it, so shouldn't	2463	* this key, then we should also have it, so shouldn't
2724	* be here. If user wants to store empty strings,	2464	* be here. If user wants to store empty strings,
2725	* should pass in ""	2465	* should pass in ""
…		…
2774	}	2514	}
2775	else	2515	else
2776	item = item->env;	2516	item = item->env;
2777	}	2517	}
2778		2518
		2519	const char *
		2520	object::flag_desc (char *desc, int len) const
		2521	{
		2522	char *p = desc;
		2523	bool first = true;
		2524
		2525	*p = 0;
		2526
		2527	for (int i = 0; i < NUM_FLAGS; i++)
		2528	{
		2529	if (len <= 10) // magic constant!
		2530	{
		2531	snprintf (p, len, ",...");
		2532	break;
		2533	}
		2534
		2535	if (flag [i])
		2536	{
		2537	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2538	len -= cnt;
		2539	p += cnt;
		2540	first = false;
		2541	}
		2542	}
		2543
		2544	return desc;
		2545	}
		2546
2779	// return a suitable string describing an objetc in enough detail to find it	2547	// return a suitable string describing an object in enough detail to find it
2780	const char *	2548	const char *
2781	object::debug_desc (char *info) const	2549	object::debug_desc (char *info) const
2782	{	2550	{
		2551	char flagdesc[512];
2783	char info2[256 * 3];	2552	char info2[256 * 4];
2784	char *p = info;	2553	char *p = info;
2785		2554
2786	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2555	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2787	count,	2556	count,
		2557	uuid.c_str (),
2788	&name,	2558	&name,
2789	title ? " " : "",	2559	title ? "\",title:\"" : "",
2790	title ? (const char *)title : "");	2560	title ? (const char *)title : "",
		2561	flag_desc (flagdesc, 512), type);
2791		2562
2792	if (env)	2563	if (!this->flag[FLAG_REMOVED] && env)
2793	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2564	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2794		2565
2795	if (map)	2566	if (map)
2796	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2567	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2797		2568
2798	return info;	2569	return info;
2799	}	2570	}
2800		2571
2801	const char *	2572	const char *
2802	object::debug_desc () const	2573	object::debug_desc () const
2803	{	2574	{
2804	static char info[256 * 3];	2575	static char info[3][256 * 4];
		2576	static int info_idx;
		2577
2805	return debug_desc (info);	2578	return debug_desc (info [++info_idx % 3]);
2806	}	2579	}
2807		2580
		2581	struct region *
		2582	object::region () const
		2583	{
		2584	return map ? map->region (x, y)
		2585	: region::default_region ();
		2586	}
		2587
		2588	const materialtype_t *
		2589	object::dominant_material () const
		2590	{
		2591	if (materialtype_t *mt = name_to_material (materialname))
		2592	return mt;
		2593
		2594	return name_to_material (shstr_unknown);
		2595	}
		2596
		2597	void
		2598	object::open_container (object *new_container)
		2599	{
		2600	if (container == new_container)
		2601	return;
		2602
		2603	if (object *old_container = container)
		2604	{
		2605	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2606	return;
		2607
		2608	#if 0
		2609	// remove the "Close old_container" object.
		2610	if (object *closer = old_container->inv)
		2611	if (closer->type == CLOSE_CON)
		2612	closer->destroy ();
		2613	#endif
		2614
		2615	old_container->flag [FLAG_APPLIED] = 0;
		2616	container = 0;
		2617
		2618	esrv_update_item (UPD_FLAGS, this, old_container);
		2619	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2620	play_sound (sound_find ("chest_close"));
		2621	}
		2622
		2623	if (new_container)
		2624	{
		2625	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2626	return;
		2627
		2628	// TODO: this does not seem to serve any purpose anymore?
		2629	#if 0
		2630	// insert the "Close Container" object.
		2631	if (archetype *closer = new_container->other_arch)
		2632	{
		2633	object *closer = arch_to_object (new_container->other_arch);
		2634	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2635	new_container->insert (closer);
		2636	}
		2637	#endif
		2638
		2639	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2640
		2641	new_container->flag [FLAG_APPLIED] = 1;
		2642	container = new_container;
		2643
		2644	esrv_update_item (UPD_FLAGS, this, new_container);
		2645	esrv_send_inventory (this, new_container);
		2646	play_sound (sound_find ("chest_open"));
		2647	}
		2648	}
		2649
		2650	object *
		2651	object::force_find (const shstr name)
		2652	{
		2653	/* cycle through his inventory to look for the MARK we want to
		2654	* place
		2655	*/
		2656	for (object *tmp = inv; tmp; tmp = tmp->below)
		2657	if (tmp->type == FORCE && tmp->slaying == name)
		2658	return splay (tmp);
		2659
		2660	return 0;
		2661	}
		2662
		2663	void
		2664	object::force_add (const shstr name, int duration)
		2665	{
		2666	if (object *force = force_find (name))
		2667	force->destroy ();
		2668
		2669	object *force = get_archetype (FORCE_NAME);
		2670
		2671	force->slaying = name;
		2672	force->stats.food = 1;
		2673	force->speed_left = -1.f;
		2674
		2675	force->set_speed (duration ? 1.f / duration : 0.f);
		2676	force->flag [FLAG_IS_USED_UP] = true;
		2677	force->flag [FLAG_APPLIED] = true;
		2678
		2679	insert (force);
		2680	}
		2681
		2682	void
		2683	object::play_sound (faceidx sound)
		2684	{
		2685	if (!sound)
		2686	return;
		2687
		2688	if (flag [FLAG_REMOVED])
		2689	return;
		2690
		2691	if (env)
		2692	{
		2693	if (object *pl = in_player ())
		2694	pl->contr->play_sound (sound);
		2695	}
		2696	else
		2697	map->play_sound (sound, x, y);
		2698	}
		2699

Diff Legend

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