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

Diff Legend

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