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.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.232 by root, Tue May 6 18:09:42 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;
139
140	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
141	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
143	*/	147	*/
144		148
145	/* For each field in wants, */	149	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
147	{	151	if (has->kv_get (kv->key) != kv->value)
148	key_value *has_field;	152	return false;
149
150	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);
152
153	if (has_field == NULL)
154	{
155	/* No field with that name. */
156	return FALSE;
157	}
158
159	/* Found the matching field. */
160	if (has_field->value != wants_field->value)
161	{
162	/* Values don't match, so this half of the comparison is false. */
163	return FALSE;
164	}
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		153
169	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
170	return TRUE;	155	return true;
171	}	156	}
172		157
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static int	159	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	161	{
177	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
179	*/	164	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
181	}	167	}
182		168
183	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	170	* they can be merged together.
185	*	171	*
…		…
200	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
201	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
203	return 0;	189	return 0;
204		190
205	//TODO: this ain't working well, use nicer and correct overflow check	191	/* Do not merge objects if nrof would overflow. First part checks
206	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	192	* for unsigned overflow (2c), second part checks whether the result
207	* value could not be stored in a sint32 (which unfortunately sometimes is	193	* would fit into a 32 bit signed int, which is often used to hold
208	* used to store nrof).	194	* nrof values.
209	*/	195	*/
210	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	197	return 0;
212		198
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* This is to the comparison of the flags below will be OK. We	200	* This is to the comparison of the flags below will be OK. We
215	* just can't ignore the been applied or identified flags, as they	201	* just can't ignore the been applied or identified flags, as they
216	* are not equal - just if it has been identified, the been_applied	202	* are not equal - just if it has been identified, the been_applied
217	* flags lose any meaning.	203	* flags lose any meaning.
218	*/	204	*/
219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		207
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		210
225	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->name != ob2->arch->name
226	|| ob1->arch != ob2->arch
227	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
228	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
229	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
230	|| ob1->weight != ob2->weight	215	|| ob1->weight != ob2->weight
231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
233	|| ob1->attacktype != ob2->attacktype	216	|| ob1->attacktype != ob2->attacktype
234	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
235	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
236	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
237	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
…		…
244	|| ob1->move_block != ob2->move_block	227	|| ob1->move_block != ob2->move_block
245	|| ob1->move_allow != ob2->move_allow	228	|| ob1->move_allow != ob2->move_allow
246	|| ob1->move_on != ob2->move_on	229	|| ob1->move_on != ob2->move_on
247	|| ob1->move_off != ob2->move_off	230	|| ob1->move_off != ob2->move_off
248	|| ob1->move_slow != ob2->move_slow	231	|| ob1->move_slow != ob2->move_slow
249	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	232	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250	return 0;	235	return 0;
251		236
		237	if ((ob1->flag ^ ob2->flag)
		238	.reset (FLAG_INV_LOCKED)
		239	.reset (FLAG_CLIENT_SENT)
		240	.reset (FLAG_REMOVED)
		241	.any ())
		242	return 0;
		243
252	/* This is really a spellbook check - really, we should	244	/* This is really a spellbook check - we should in general
253	* check all objects in the inventory.	245	* not merge objects with real inventories, as splitting them
		246	* is hard.
254	*/	247	*/
255	if (ob1->inv || ob2->inv)	248	if (ob1->inv || ob2->inv)
256	{	249	{
257	/* if one object has inventory but the other doesn't, not equiv */	250	if (!(ob1->inv && ob2->inv))
258	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	251	return 0; /* inventories differ in length */
259	return 0;
260		252
261	/* Now check to see if the two inventory objects could merge */	253	if (ob1->inv->below || ob2->inv->below)
		254	return 0; /* more than one object in inv */
		255
262	if (!object::can_merge (ob1->inv, ob2->inv))	256	if (!object::can_merge (ob1->inv, ob2->inv))
263	return 0;	257	return 0; /* inventory objects differ */
264		258
265	/* inventory ok - still need to check rest of this object to see	259	/* inventory ok - still need to check rest of this object to see
266	* if it is valid.	260	* if it is valid.
267	*/	261	*/
268	}	262	}
…		…
287	if (ob1->level != ob2->level)	281	if (ob1->level != ob2->level)
288	return 0;	282	return 0;
289	break;	283	break;
290	}	284	}
291		285
292	if (ob1->key_values != NULL || ob2->key_values != NULL)	286	if (ob1->key_values || ob2->key_values)
293	{	287	{
294	/* At least one of these has key_values. */	288	/* At least one of these has key_values. */
295	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	289	if ((!ob1->key_values) != (!ob2->key_values))
296	/* One has fields, but the other one doesn't. */	290	return 0; /* One has fields, but the other one doesn't. */
		291
		292	if (!compare_ob_value_lists (ob1, ob2))
297	return 0;	293	return 0;
298	else if (!compare_ob_value_lists (ob1, ob2))
299	return 0;
300	}	294	}
301		295
302	//TODO: generate an event or call into perl for additional checks
303	if (ob1->self || ob2->self)	296	if (ob1->self || ob2->self)
304	{	297	{
305	ob1->optimise ();	298	ob1->optimise ();
306	ob2->optimise ();	299	ob2->optimise ();
307		300
308	if (ob1->self || ob2->self)	301	if (ob1->self || ob2->self)
		302	{
		303	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		304	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		305
		306	if (k1 != k2)
309	return 0;	307	return 0;
		308
		309	if (k1 == 0)
		310	return 1;
		311
		312	if (!cfperl_can_merge (ob1, ob2))
		313	return 0;
		314	}
310	}	315	}
311		316
312	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
313	return 1;	318	return 1;
314	}	319	}
315		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container || this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
		357	// adjust weight per container type ("of holding")
		358	static sint32
		359	weight_adjust (object *op, sint32 weight)
		360	{
		361	return op->type == CONTAINER
		362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		363	: weight;
		364	}
		365
316	/*	366	/*
		367	* adjust_weight(object, weight) adds the specified weight to an object,
		368	* and also updates how much the environment(s) is/are carrying.
		369	*/
		370	static void
		371	adjust_weight (object *op, sint32 weight)
		372	{
		373	while (op)
		374	{
		375	weight = weight_adjust (op, weight);
		376
		377	if (!weight)
		378	return;
		379
		380	op->carrying += weight;
		381
		382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
		384	esrv_update_item (UPD_WEIGHT, pl, op);
		385
		386	op = op->env;
		387	}
		388	}
		389
		390	/*
317	* sum_weight() is a recursive function which calculates the weight	391	* this is a recursive function which calculates the weight
318	* an object is carrying. It goes through in figures out how much	392	* an object is carrying. It goes through op and figures out how much
319	* containers are carrying, and sums it up.	393	* containers are carrying, and sums it up.
320	*/	394	*/
321	long	395	void
322	sum_weight (object *op)	396	object::update_weight ()
323	{	397	{
324	long sum;	398	sint32 sum = 0;
325	object *inv;
326		399
327	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	400	for (object *op = inv; op; op = op->below)
328	{	401	{
329	if (inv->inv)	402	if (op->inv)
330	sum_weight (inv);	403	op->update_weight ();
331	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	404
		405	sum += op->total_weight ();
		406	}
		407
		408	sum = weight_adjust (this, sum);
		409
		410	if (sum != carrying)
332	}	411	{
333
334	if (op->type == CONTAINER && op->stats.Str)
335	sum = (sum * (100 - op->stats.Str)) / 100;
336
337	if (op->carrying != sum)
338	op->carrying = sum;	412	carrying = sum;
339		413
340	return sum;	414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
		416	esrv_update_item (UPD_WEIGHT, pl, this);
		417	}
341	}	418	}
342		419
343	/**	420	/*
344	* Return the outermost environment object for a given object.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
345	*/	422	*/
346
347	object *
348	object_get_env_recursive (object *op)
349	{
350	while (op->env != NULL)
351	op = op->env;
352	return op;
353	}
354
355	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.
358	* The result of the dump is stored in the static global errmsg array.
359	*/
360
361	char *	423	char *
362	dump_object (object *op)	424	dump_object (object *op)
363	{	425	{
364	if (!op)	426	if (!op)
365	return strdup ("[NULLOBJ]");	427	return strdup ("[NULLOBJ]");
366		428
367	object_freezer freezer;	429	object_freezer freezer;
368	save_object (freezer, op, 1);	430	op->write (freezer);
369	return freezer.as_string ();	431	return freezer.as_string ();
370	}	432	}
371		433
372	/*	434	/*
373	* get_nearest_part(multi-object, object 2) returns the part of the	435	* get_nearest_part(multi-object, object 2) returns the part of the
374	* multi-object 1 which is closest to the second object.	436	* multi-object 1 which is closest to the second object.
375	* If it's not a multi-object, it is returned.	437	* If it's not a multi-object, it is returned.
376	*/	438	*/
377
378	object *	439	object *
379	get_nearest_part (object *op, const object *pl)	440	get_nearest_part (object *op, const object *pl)
380	{	441	{
381	object *tmp, *closest;	442	object *tmp, *closest;
382	int last_dist, i;	443	int last_dist, i;
383		444
384	if (op->more == NULL)	445	if (!op->more)
385	return op;	446	return op;
		447
386	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	448	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		449	tmp;
		450	tmp = tmp->more)
387	if ((i = distance (tmp, pl)) < last_dist)	451	if ((i = distance (tmp, pl)) < last_dist)
388	closest = tmp, last_dist = i;	452	closest = tmp, last_dist = i;
		453
389	return closest;	454	return closest;
390	}	455	}
391		456
392	/*	457	/*
393	* Returns the object which has the count-variable equal to the argument.	458	* Returns the object which has the count-variable equal to the argument.
		459	* VERRRY slow.
394	*/	460	*/
395
396	object *	461	object *
397	find_object (tag_t i)	462	find_object (tag_t i)
398	{	463	{
399	for (object *op = object::first; op; op = op->next)	464	for_all_objects (op)
400	if (op->count == i)	465	if (op->count == i)
401	return op;	466	return op;
402		467
403	return 0;	468	return 0;
404	}	469	}
405		470
406	/*	471	/*
407	* Returns the first object which has a name equal to the argument.	472	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	473	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	474	* Enables features like "patch <name-of-other-player> food 999"
410	*/	475	*/
411
412	object *	476	object *
413	find_object_name (const char *str)	477	find_object_name (const char *str)
414	{	478	{
415	shstr_cmp str_ (str);	479	shstr_cmp str_ (str);
416	object *op;	480	object *op;
417		481
418	for (op = object::first; op != NULL; op = op->next)	482	for_all_objects (op)
419	if (op->name == str_)	483	if (op->name == str_)
420	break;	484	break;
421		485
422	return op;	486	return op;
423	}	487	}
424		488
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	489	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	490	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	491	* skill and experience objects.
		492	* ACTUALLY NO! investigate! TODO
434	*/	493	*/
435	void	494	void
436	object::set_owner (object *owner)	495	object::set_owner (object *owner)
437	{	496	{
		497	// allow objects which own objects
438	if (!owner)	498	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	499	while (owner->owner)
449	owner = owner->owner;	500	owner = owner->owner;
		501
		502	if (flag [FLAG_FREED])
		503	{
		504	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		505	return;
		506	}
450		507
451	this->owner = owner;	508	this->owner = owner;
		509	}
		510
		511	int
		512	object::slottype () const
		513	{
		514	if (type == SKILL)
		515	{
		516	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		517	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		518	}
		519	else
		520	{
		521	if (slot [body_combat].info) return slot_combat;
		522	if (slot [body_range ].info) return slot_ranged;
		523	}
		524
		525	return slot_none;
		526	}
		527
		528	bool
		529	object::change_weapon (object *ob)
		530	{
		531	if (current_weapon == ob)
		532	return true;
		533
		534	if (chosen_skill)
		535	chosen_skill->flag [FLAG_APPLIED] = false;
		536
		537	current_weapon = ob;
		538	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		539
		540	if (chosen_skill)
		541	chosen_skill->flag [FLAG_APPLIED] = true;
		542
		543	update_stats ();
		544
		545	if (ob)
		546	{
		547	// now check wether any body locations became invalid, in which case
		548	// we cannot apply the weapon at the moment.
		549	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		550	if (slot[i].used < 0)
		551	{
		552	current_weapon = chosen_skill = 0;
		553	update_stats ();
		554
		555	new_draw_info_format (NDI_UNIQUE, 0, this,
		556	"You try to balance all your items at once, "
		557	"but the %s is just too much for your body. "
		558	"[You need to unapply some items first.]", &ob->name);
		559	return false;
		560	}
		561
		562	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		563	}
		564	else
		565	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		566
		567	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		568	{
		569	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		570	&name, ob->debug_desc ());
		571	return false;
		572	}
		573
		574	return true;
452	}	575	}
453		576
454	/* Zero the key_values on op, decrementing the shared-string	577	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	578	* refcounts and freeing the links.
456	*/	579	*/
457	static void	580	static void
458	free_key_values (object *op)	581	free_key_values (object *op)
459	{	582	{
460	for (key_value *i = op->key_values; i != 0;)	583	for (key_value *i = op->key_values; i; )
461	{	584	{
462	key_value *next = i->next;	585	key_value *next = i->next;
463	delete i;	586	delete i;
464		587
465	i = next;	588	i = next;
…		…
477	* will point at garbage.	600	* will point at garbage.
478	*/	601	*/
479	void	602	void
480	object::copy_to (object *dst)	603	object::copy_to (object *dst)
481	{	604	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	605	dst->remove ();
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
484
485	*(object_copy *)dst = *this;	606	*(object_copy *)dst = *this;
486		607	dst->flag [FLAG_REMOVED] = true;
487	if (is_freed)
488	SET_FLAG (dst, FLAG_FREED);
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		608
496	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
497	if (key_values)	610	if (key_values)
498	{	611	{
499	key_value *tail = 0;	612	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	613	dst->key_values = 0;
503		614
504	for (i = key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
505	{	616	{
506	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
507		618
508	new_link->next = 0;	619	new_link->next = 0;
509	new_link->key = i->key;	620	new_link->key = i->key;
510	new_link->value = i->value;	621	new_link->value = i->value;
511		622
512	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
513	if (!dst->key_values)	624	if (!dst->key_values)
514	{	625	{
…		…
521	tail = new_link;	632	tail = new_link;
522	}	633	}
523	}	634	}
524	}	635	}
525		636
		637	if (speed < 0)
		638	dst->speed_left -= rndm ();
		639
526	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
		641	}
		642
		643	void
		644	object::instantiate ()
		645	{
		646	if (!uuid.seq) // HACK
		647	uuid = UUID::gen ();
		648
		649	speed_left = -0.1f;
		650	/* copy the body_info to the body_used - this is only really
		651	* need for monsters, but doesn't hurt to do it for everything.
		652	* by doing so, when a monster is created, it has good starting
		653	* values for the body_used info, so when items are created
		654	* for it, they can be properly equipped.
		655	*/
		656	for (int i = NUM_BODY_LOCATIONS; i--; )
		657	slot[i].used = slot[i].info;
		658
		659	attachable::instantiate ();
527	}	660	}
528		661
529	object *	662	object *
530	object::clone ()	663	object::clone ()
531	{	664	{
532	object *neu = create ();	665	object *neu = create ();
533	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
534	return neu;	668	return neu;
535	}	669	}
536		670
537	/*	671	/*
538	* If an object with the IS_TURNABLE() flag needs to be turned due	672	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
564	}	698	}
565		699
566	this->speed = speed;	700	this->speed = speed;
567		701
568	if (has_active_speed ())	702	if (has_active_speed ())
569	activate (false);	703	activate ();
570	else	704	else
571	deactivate (false);	705	deactivate ();
572	}	706	}
573		707
574	/*	708	/*
575	* update_object() updates the the map.	709	* update_object() updates the the map.
576	* It takes into account invisible objects (and represent squares covered	710	* It takes into account invisible objects (and represent squares covered
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
590	*/	724	*/
591	void	725	void
592	update_object (object *op, int action)	726	update_object (object *op, int action)
593	{	727	{
594	MoveType move_on, move_off, move_block, move_slow;	728	if (!op)
595
596	if (op == NULL)
597	{	729	{
598	/* this should never happen */	730	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
600	return;	732	return;
601	}	733	}
602		734
603	if (op->env)	735	if (!op->is_on_map ())
604	{	736	{
605	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
606	* to do in this case.	738	* to do in this case.
607	*/	739	*/
608	return;	740	return;
609	}	741	}
610
611	/* If the map is saving, don't do anything as everything is
612	* going to get freed anyways.
613	*/
614	if (!op->map || op->map->in_memory == MAP_SAVING)
615	return;
616		742
617	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	744	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
619	{	745	{
620	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
624	return;	750	return;
625	}	751	}
626		752
627	mapspace &m = op->ms ();	753	mapspace &m = op->ms ();
628		754
629	if (m.flags_ & P_NEED_UPDATE)	755	if (!(m.flags_ & P_UPTODATE))
630	/* nop */;	756	/* nop */;
631	else if (action == UP_OBJ_INSERT)	757	else if (action == UP_OBJ_INSERT)
632	{	758	{
633	// this is likely overkill, TODO: revisit (schmorp)	759	// this is likely overkill, TODO: revisit (schmorp)
634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	760	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
643	/* This isn't perfect, but I don't expect a lot of objects to	769	/* This isn't perfect, but I don't expect a lot of objects to
644	* to have move_allow right now.	770	* to have move_allow right now.
645	*/	771	*/
646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	772	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	773	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648	m.flags_ = P_NEED_UPDATE;	774	m.flags_ = 0;
649	}	775	}
650	/* if the object is being removed, we can't make intelligent	776	/* if the object is being removed, we can't make intelligent
651	* decisions, because remove_ob can't really pass the object	777	* decisions, because remove_ob can't really pass the object
652	* that is being removed.	778	* that is being removed.
653	*/	779	*/
654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	780	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655	m.flags_ = P_NEED_UPDATE;	781	m.flags_ = 0;
656	else if (action == UP_OBJ_FACE)	782	else if (action == UP_OBJ_FACE)
657	/* Nothing to do for that case */ ;	783	/* Nothing to do for that case */ ;
658	else	784	else
659	LOG (llevError, "update_object called with invalid action: %d\n", action);	785	LOG (llevError, "update_object called with invalid action: %d\n", action);
660		786
661	if (op->more)	787	if (op->more)
662	update_object (op->more, action);	788	update_object (op->more, action);
663	}	789	}
664		790
665	object::vector object::objects; // not yet used
666	object *object::first;
667
668	object::object ()	791	object::object ()
669	{	792	{
670	SET_FLAG (this, FLAG_REMOVED);	793	SET_FLAG (this, FLAG_REMOVED);
671		794
672	expmul = 1.0;	795	expmul = 1.0;
673	face = blank_face;	796	face = blank_face;
674	}	797	}
675		798
676	object::~object ()	799	object::~object ()
677	{	800	{
		801	unlink ();
		802
678	free_key_values (this);	803	free_key_values (this);
679	}	804	}
680		805
		806	static int object_count;
		807
681	void object::link ()	808	void object::link ()
682	{	809	{
		810	assert (!index);//D
		811	uuid = UUID::gen ();
683	count = ++ob_count;	812	count = ++object_count;
684	uuid = gen_uuid ();
685		813
686	prev = 0;	814	refcnt_inc ();
687	next = object::first;	815	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	816	}
694		817
695	void object::unlink ()	818	void object::unlink ()
696	{	819	{
697	if (this == object::first)	820	if (!index)
698	object::first = next;	821	return;
699		822
700	/* Remove this object from the list of used objects */	823	objects.erase (this);
701	if (prev) prev->next = next;	824	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}	825	}
707		826
708	void	827	void
709	object::activate (bool recursive)	828	object::activate ()
710	{	829	{
		830	/* If already on active list, don't do anything */
		831	if (active)
		832	return;
		833
711	if (has_active_speed ())	834	if (has_active_speed ())
712	{	835	actives.insert (this);
713	/* If already on active list, don't do anything */	836	}
714	if (active_next || active_prev || this == active_objects)
715	return;
716		837
717	/* process_events() expects us to insert the object at the beginning	838	void
718	* of the list. */	839	object::activate_recursive ()
719	active_next = active_objects;	840	{
		841	activate ();
720		842
721	if (active_next)
722	active_next->active_prev = this;
723
724	active_objects = this;
725	}
726
727	if (recursive)
728	for (object *op = inv; op; op = op->above)	843	for (object *op = inv; op; op = op->below)
729	op->activate (1);	844	op->activate_recursive ();
730	}	845	}
731		846
732	/* This function removes object 'op' from the list of active	847	/* This function removes object 'op' from the list of active
733	* objects.	848	* objects.
734	* This should only be used for style maps or other such	849	* This should only be used for style maps or other such
…		…
736	* in play chewing up cpu time getting processed.	851	* in play chewing up cpu time getting processed.
737	* The reverse of this is to call update_ob_speed, which	852	* The reverse of this is to call update_ob_speed, which
738	* will do the right thing based on the speed of the object.	853	* will do the right thing based on the speed of the object.
739	*/	854	*/
740	void	855	void
741	object::deactivate (bool recursive)	856	object::deactivate ()
742	{	857	{
743	/* If not on the active list, nothing needs to be done */	858	/* If not on the active list, nothing needs to be done */
744	if (!active_next && !active_prev && this != active_objects)	859	if (!active)
745	return;	860	return;
746		861
747	if (active_prev == 0)	862	actives.erase (this);
748	{	863	}
749	active_objects = active_next;
750	if (active_next)
751	active_next->active_prev = 0;
752	}
753	else
754	{
755	active_prev->active_next = active_next;
756	if (active_next)
757	active_next->active_prev = active_prev;
758	}
759		864
760	active_next = 0;	865	void
761	active_prev = 0;	866	object::deactivate_recursive ()
762		867	{
763	if (recursive)
764	for (object *op = inv; op; op = op->above)	868	for (object *op = inv; op; op = op->below)
		869	op->deactivate_recursive ();
		870
765	op->deactivate (1);	871	deactivate ();
		872	}
		873
		874	void
		875	object::set_flag_inv (int flag, int value)
		876	{
		877	for (object *op = inv; op; op = op->below)
		878	{
		879	op->flag [flag] = value;
		880	op->set_flag_inv (flag, value);
		881	}
766	}	882	}
767		883
768	/*	884	/*
769	* Remove and free all objects in the inventory of the given object.	885	* Remove and free all objects in the inventory of the given object.
770	* object.c ?	886	* object.c ?
…		…
773	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
774	{	890	{
775	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
776	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
777	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
778	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
779	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
780	if (!inv)	896	if (!inv)
781	return;	897	return;
782		898
783	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
784	* if some form of movement is allowed, let objects	900	* if some form of movement is allowed, let objects
785	* drop on that space.	901	* drop on that space.
786	*/	902	*/
787	if (!drop_to_ground	903	if (!drop_to_ground
788	|| !map	904	|| !map
789	|| map->in_memory != MAP_IN_MEMORY	905	|| map->in_memory != MAP_ACTIVE
		906	|| map->nodrop
790	|| ms ().move_block == MOVE_ALL)	907	|| ms ().move_block == MOVE_ALL)
791	{	908	{
792	while (inv)	909	while (inv)
793	{	910	{
794	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
795	inv->destroy ();	912	inv->destroy ();
796	}	913	}
797	}	914	}
798	else	915	else
799	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
803		920
804	if (op->flag [FLAG_STARTEQUIP]	921	if (op->flag [FLAG_STARTEQUIP]
805	|| op->flag [FLAG_NO_DROP]	922	|| op->flag [FLAG_NO_DROP]
806	|| op->type == RUNE	923	|| op->type == RUNE
807	|| op->type == TRAP	924	|| op->type == TRAP
808	|| op->flag [FLAG_IS_A_TEMPLATE])	925	|| op->flag [FLAG_IS_A_TEMPLATE]
		926	|| op->flag [FLAG_DESTROY_ON_DEATH])
809	op->destroy ();	927	op->destroy (true);
810	else	928	else
811	map->insert (op, x, y);	929	map->insert (op, x, y);
812	}	930	}
813	}	931	}
814	}	932	}
…		…
818	object *op = new object;	936	object *op = new object;
819	op->link ();	937	op->link ();
820	return op;	938	return op;
821	}	939	}
822		940
		941	static struct freed_map : maptile
		942	{
		943	freed_map ()
		944	{
		945	path = "<freed objects map>";
		946	name = "/internal/freed_objects_map";
		947	width = 3;
		948	height = 3;
		949	nodrop = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954
		955	~freed_map ()
		956	{
		957	destroy ();
		958	}
		959	} freed_map; // freed objects are moved here to avoid crashes
		960
823	void	961	void
824	object::do_destroy ()	962	object::do_destroy ()
825	{	963	{
826	if (flag [FLAG_IS_LINKED])	964	if (flag [FLAG_IS_LINKED])
827	remove_button_link (this);	965	remove_button_link (this);
828		966
829	if (flag [FLAG_FRIENDLY])	967	if (flag [FLAG_FRIENDLY])
830	remove_friendly_object (this);	968	remove_friendly_object (this);
831		969
832	if (!flag [FLAG_REMOVED])
833	remove ();	970	remove ();
834		971
835	if (flag [FLAG_FREED])	972	attachable::do_destroy ();
836	return;
837		973
838	set_speed (0);	974	deactivate ();
		975	unlink ();
839		976
840	flag [FLAG_FREED] = 1;	977	flag [FLAG_FREED] = 1;
841		978
842	attachable::do_destroy ();
843
844	destroy_inv (true);
845	unlink ();
846
847	// hack to ensure that freed objects still have a valid map	979	// hack to ensure that freed objects still have a valid map
848	{
849	static maptile *freed_map; // freed objects are moved here to avoid crashes
850
851	if (!freed_map)
852	{
853	freed_map = new maptile;
854
855	freed_map->name = "/internal/freed_objects_map";
856	freed_map->width = 3;
857	freed_map->height = 3;
858
859	freed_map->alloc ();
860	}
861
862	map = freed_map;	980	map = &freed_map;
863	x = 1;	981	x = 1;
864	y = 1;	982	y = 1;
865	}
866
867	head = 0;
868		983
869	if (more)	984	if (more)
870	{	985	{
871	more->destroy ();	986	more->destroy ();
872	more = 0;	987	more = 0;
873	}	988	}
874		989
		990	head = 0;
		991
875	// clear those pointers that likely might have circular references to us	992	// clear those pointers that likely might cause circular references
876	owner = 0;	993	owner = 0;
877	enemy = 0;	994	enemy = 0;
878	attacked_by = 0;	995	attacked_by = 0;
879		996	current_weapon = 0;
880	// only relevant for players(?), but make sure of it anyways
881	contr = 0;
882	}	997	}
883		998
884	void	999	void
885	object::destroy (bool destroy_inventory)	1000	object::destroy (bool destroy_inventory)
886	{	1001	{
887	if (destroyed ())	1002	if (destroyed ())
888	return;	1003	return;
889		1004
		1005	if (!is_head () && !head->destroyed ())
		1006	{
		1007	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1008	head->destroy (destroy_inventory);
		1009	return;
		1010	}
		1011
890	if (destroy_inventory)	1012	destroy_inv (!destroy_inventory);
891	destroy_inv (false);	1013
		1014	if (is_head ())
		1015	if (sound_destroy)
		1016	play_sound (sound_destroy);
		1017	else if (flag [FLAG_MONSTER])
		1018	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
892		1019
893	attachable::destroy ();	1020	attachable::destroy ();
894	}
895
896	/*
897	* sub_weight() recursively (outwards) subtracts a number from the
898	* weight of an object (and what is carried by it's environment(s)).
899	*/
900	void
901	sub_weight (object *op, signed long weight)
902	{
903	while (op != NULL)
904	{
905	if (op->type == CONTAINER)
906	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
907
908	op->carrying -= weight;
909	op = op->env;
910	}
911	}	1021	}
912		1022
913	/* op->remove ():	1023	/* op->remove ():
914	* This function removes the object op from the linked list of objects	1024	* This function removes the object op from the linked list of objects
915	* which it is currently tied to. When this function is done, the	1025	* which it is currently tied to. When this function is done, the
916	* object will have no environment. If the object previously had an	1026	* object will have no environment. If the object previously had an
917	* environment, the x and y coordinates will be updated to	1027	* environment, the x and y coordinates will be updated to
918	* the previous environment.	1028	* the previous environment.
919	* Beware: This function is called from the editor as well!
920	*/	1029	*/
921	void	1030	void
922	object::remove ()	1031	object::do_remove ()
923	{	1032	{
924	object *tmp, *last = 0;	1033	object *tmp, *last = 0;
925	object *otmp;	1034	object *otmp;
926		1035
927	if (QUERY_FLAG (this, FLAG_REMOVED))	1036	if (flag [FLAG_REMOVED])
928	return;	1037	return;
929		1038
930	SET_FLAG (this, FLAG_REMOVED);
931	INVOKE_OBJECT (REMOVE, this);	1039	INVOKE_OBJECT (REMOVE, this);
		1040
		1041	flag [FLAG_REMOVED] = true;
932		1042
933	if (more)	1043	if (more)
934	more->remove ();	1044	more->remove ();
935		1045
936	/*	1046	/*
937	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
938	* inventory.	1048	* inventory.
939	*/	1049	*/
940	if (env)	1050	if (env)
941	{	1051	{
		1052	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1053	if (object *pl = visible_to ())
		1054	esrv_del_item (pl->contr, count);
		1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1056
		1057	adjust_weight (env, -total_weight ());
		1058
		1059	*(above ? &above->below : &env->inv) = below;
		1060
942	if (nrof)	1061	if (below)
943	sub_weight (env, weight * nrof);	1062	below->above = above;
944	else	1063
945	sub_weight (env, weight + carrying);	1064	/* we set up values so that it could be inserted into
		1065	* the map, but we don't actually do that - it is up
		1066	* to the caller to decide what we want to do.
		1067	*/
		1068	map = env->map;
		1069	x = env->x;
		1070	y = env->y;
		1071	above = 0;
		1072	below = 0;
		1073	env = 0;
946		1074
947	/* NO_FIX_PLAYER is set when a great many changes are being	1075	/* NO_FIX_PLAYER is set when a great many changes are being
948	* made to players inventory. If set, avoiding the call	1076	* made to players inventory. If set, avoiding the call
949	* to save cpu time.	1077	* to save cpu time.
950	*/	1078	*/
951	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
952	otmp->update_stats ();	1080	otmp->update_stats ();
953
954	if (above)
955	above->below = below;
956	else
957	env->inv = below;
958
959	if (below)
960	below->above = above;
961
962	/* we set up values so that it could be inserted into
963	* the map, but we don't actually do that - it is up
964	* to the caller to decide what we want to do.
965	*/
966	x = env->x, y = env->y;
967	map = env->map;
968	above = 0, below = 0;
969	env = 0;
970	}	1081	}
971	else if (map)	1082	else if (map)
972	{	1083	{
973	if (type == PLAYER)	1084	map->dirty = true;
		1085	mapspace &ms = this->ms ();
		1086
		1087	if (object *pl = ms.player ())
974	{	1088	{
		1089	if (type == PLAYER) // this == pl(!)
		1090	{
		1091	// leaving a spot always closes any open container on the ground
		1092	if (container && !container->env)
		1093	// this causes spurious floorbox updates, but it ensures
		1094	// that the CLOSE event is being sent.
		1095	close_container ();
		1096
975	--map->players;	1097	--map->players;
976	map->last_access = runtime;	1098	map->touch ();
		1099	}
		1100	else if (pl->container == this)
		1101	{
		1102	// removing a container should close it
		1103	close_container ();
		1104	}
		1105
		1106	esrv_del_item (pl->contr, count);
977	}	1107	}
978
979		1108
980	/* link the object above us */	1109	/* link the object above us */
981	if (above)	1110	if (above)
982	above->below = below;	1111	above->below = below;
983	else	1112	else
984	map->at (x, y).top = below; /* we were top, set new top */	1113	ms.top = below; /* we were top, set new top */
985		1114
986	/* Relink the object below us, if there is one */	1115	/* Relink the object below us, if there is one */
987	if (below)	1116	if (below)
988	below->above = above;	1117	below->above = above;
989	else	1118	else
…		…
991	/* Nothing below, which means we need to relink map object for this space	1120	/* Nothing below, which means we need to relink map object for this space
992	* use translated coordinates in case some oddness with map tiling is	1121	* use translated coordinates in case some oddness with map tiling is
993	* evident	1122	* evident
994	*/	1123	*/
995	if (GET_MAP_OB (map, x, y) != this)	1124	if (GET_MAP_OB (map, x, y) != this)
996	{
997	char *dump = dump_object (this);
998	LOG (llevError,
999	"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);	1125	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 ());
1000	free (dump);
1001	dump = dump_object (GET_MAP_OB (map, x, y));
1002	LOG (llevError, "%s\n", dump);
1003	free (dump);
1004	}
1005		1126
1006	map->at (x, y).bot = above; /* goes on above it. */	1127	ms.bot = above; /* goes on above it. */
1007	}	1128	}
1008		1129
1009	above = 0;	1130	above = 0;
1010	below = 0;	1131	below = 0;
1011		1132
1012	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1013	return;	1134	return;
1014		1135
1015	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
1016		1137
		1138	if (object *pl = ms.player ())
		1139	{
		1140	if (pl->container == this)
		1141	/* If a container that the player is currently using somehow gets
		1142	* removed (most likely destroyed), update the player view
		1143	* appropriately.
		1144	*/
		1145	pl->close_container ();
		1146
		1147	//TODO: the floorbox prev/next might need updating
		1148	//esrv_del_item (pl->contr, count);
		1149	//TODO: update floorbox to preserve ordering
		1150	if (pl->contr->ns)
		1151	pl->contr->ns->floorbox_update ();
		1152	}
		1153
1017	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1154	for (tmp = ms.bot; tmp; tmp = tmp->above)
1018	{	1155	{
1019	/* No point updating the players look faces if he is the object	1156	/* No point updating the players look faces if he is the object
1020	* being removed.	1157	* being removed.
1021	*/	1158	*/
1022
1023	if (tmp->type == PLAYER && tmp != this)
1024	{
1025	/* If a container that the player is currently using somehow gets
1026	* removed (most likely destroyed), update the player view
1027	* appropriately.
1028	*/
1029	if (tmp->container == this)
1030	{
1031	flag [FLAG_APPLIED] = 0;
1032	tmp->container = 0;
1033	}
1034
1035	if (tmp->contr->ns)
1036	tmp->contr->ns->floorbox_update ();
1037	}
1038		1159
1039	/* See if object moving off should effect something */	1160	/* See if object moving off should effect something */
1040	if (check_walk_off	1161	if (check_walk_off
1041	&& ((move_type & tmp->move_off)	1162	&& ((move_type & tmp->move_off)
1042	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1045		1166
1046	if (destroyed ())	1167	if (destroyed ())
1047	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1048	}	1169	}
1049		1170
1050	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1051	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1052	if (tmp->above == tmp)
1053	tmp->above = 0;
1054
1055	last = tmp;	1171	last = tmp;
1056	}	1172	}
1057		1173
1058	/* last == NULL if there are no objects on this space */	1174	/* last == NULL if there are no objects on this space */
1059	//TODO: this makes little sense, why only update the topmost object?	1175	//TODO: this makes little sense, why only update the topmost object?
1060	if (!last)	1176	if (!last)
1061	map->at (x, y).flags_ = P_NEED_UPDATE;	1177	map->at (x, y).flags_ = 0;
1062	else	1178	else
1063	update_object (last, UP_OBJ_REMOVE);	1179	update_object (last, UP_OBJ_REMOVE);
1064		1180
1065	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1181	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1066	update_all_los (map, x, y);	1182	update_all_los (map, x, y);
…		…
1079	merge_ob (object *op, object *top)	1195	merge_ob (object *op, object *top)
1080	{	1196	{
1081	if (!op->nrof)	1197	if (!op->nrof)
1082	return 0;	1198	return 0;
1083		1199
1084	if (top)	1200	if (!top)
1085	for (top = op; top && top->above; top = top->above)	1201	for (top = op; top && top->above; top = top->above)
1086	;	1202	;
1087		1203
1088	for (; top; top = top->below)	1204	for (; top; top = top->below)
1089	{
1090	if (top == op)
1091	continue;
1092
1093	if (object::can_merge (op, top))	1205	if (object::can_merge (op, top))
1094	{	1206	{
1095	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1096		1208
1097	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	if (object *pl = top->visible_to ())
1098	op->weight = 0; /* Don't want any adjustements now */	1210	esrv_update_item (UPD_NROF, pl, top);
		1211
		1212	op->weight = 0; // cancel the addition above
		1213	op->carrying = 0; // must be 0 already
		1214
1099	op->destroy ();	1215	op->destroy (1);
		1216
1100	return top;	1217	return top;
1101	}	1218	}
1102	}
1103		1219
1104	return 0;	1220	return 0;
1105	}	1221	}
1106		1222
		1223	void
		1224	object::expand_tail ()
		1225	{
		1226	if (more)
		1227	return;
		1228
		1229	object *prev = this;
		1230
		1231	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1232	{
		1233	object *op = arch_to_object (at);
		1234
		1235	op->name = name;
		1236	op->name_pl = name_pl;
		1237	op->title = title;
		1238
		1239	op->head = this;
		1240	prev->more = op;
		1241
		1242	prev = op;
		1243	}
		1244	}
		1245
1107	/*	1246	/*
1108	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1247	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1109	* job preparing multi-part monsters	1248	* job preparing multi-part monsters.
1110	*/	1249	*/
1111	object *	1250	object *
1112	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1251	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1113	{	1252	{
1114	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1115	{	1254	{
1116	tmp->x = x + tmp->arch->clone.x;	1255	tmp->x = x + tmp->arch->x;
1117	tmp->y = y + tmp->arch->clone.y;	1256	tmp->y = y + tmp->arch->y;
1118	}	1257	}
1119		1258
1120	return insert_ob_in_map (op, m, originator, flag);	1259	return insert_ob_in_map (op, m, originator, flag);
1121	}	1260	}
1122		1261
…		…
1141	* just 'op' otherwise	1280	* just 'op' otherwise
1142	*/	1281	*/
1143	object *	1282	object *
1144	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1283	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1145	{	1284	{
1146	object *tmp, *top, *floor = NULL;	1285	assert (!op->flag [FLAG_FREED]);
1147	sint16 x, y;
1148		1286
1149	if (QUERY_FLAG (op, FLAG_FREED))	1287	op->remove ();
1150	{
1151	LOG (llevError, "Trying to insert freed object!\n");
1152	return NULL;
1153	}
1154
1155	if (!m)
1156	{
1157	char *dump = dump_object (op);
1158	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1159	free (dump);
1160	return op;
1161	}
1162
1163	if (out_of_map (m, op->x, op->y))
1164	{
1165	char *dump = dump_object (op);
1166	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1167	#ifdef MANY_CORES
1168	/* Better to catch this here, as otherwise the next use of this object
1169	* is likely to cause a crash. Better to find out where it is getting
1170	* improperly inserted.
1171	*/
1172	abort ();
1173	#endif
1174	free (dump);
1175	return op;
1176	}
1177
1178	if (!QUERY_FLAG (op, FLAG_REMOVED))
1179	{
1180	char *dump = dump_object (op);
1181	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1182	free (dump);
1183	return op;
1184	}
1185
1186	if (op->more)
1187	{
1188	/* The part may be on a different map. */
1189
1190	object *more = op->more;
1191
1192	/* We really need the caller to normalize coordinates - if
1193	* we set the map, that doesn't work if the location is within
1194	* a map and this is straddling an edge. So only if coordinate
1195	* is clear wrong do we normalize it.
1196	*/
1197	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1198	more->map = get_map_from_coord (m, &more->x, &more->y);
1199	else if (!more->map)
1200	{
1201	/* For backwards compatibility - when not dealing with tiled maps,
1202	* more->map should always point to the parent.
1203	*/
1204	more->map = m;
1205	}
1206
1207	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1208	{
1209	if (!op->head)
1210	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1211
1212	return 0;
1213	}
1214	}
1215
1216	CLEAR_FLAG (op, FLAG_REMOVED);
1217		1288
1218	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1219	* of areas of callers (eg, anything that uses find_free_spot would now	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1220	* need extra work	1291	* need extra work
1221	*/	1292	*/
1222	op->map = get_map_from_coord (m, &op->x, &op->y);	1293	if (!xy_normalise (m, op->x, op->y))
1223	x = op->x;	1294	{
1224	y = op->y;	1295	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
		1296	return 0;
		1297	}
		1298
		1299	if (object *more = op->more)
		1300	if (!insert_ob_in_map (more, m, originator, flag))
		1301	return 0;
		1302
		1303	CLEAR_FLAG (op, FLAG_REMOVED);
		1304
		1305	op->map = m;
		1306	mapspace &ms = op->ms ();
1225		1307
1226	/* this has to be done after we translate the coordinates.	1308	/* this has to be done after we translate the coordinates.
1227	*/	1309	*/
1228	if (op->nrof && !(flag & INS_NO_MERGE))	1310	if (op->nrof && !(flag & INS_NO_MERGE))
1229	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1230	if (object::can_merge (op, tmp))	1312	if (object::can_merge (op, tmp))
1231	{	1313	{
		1314	// TODO: we atcually want to update tmp, not op,
		1315	// but some caller surely breaks when we return tmp
		1316	// from here :/
1232	op->nrof += tmp->nrof;	1317	op->nrof += tmp->nrof;
1233	tmp->destroy ();	1318	tmp->destroy (1);
1234	}	1319	}
1235		1320
1236	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1237	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1238		1323
…		…
1251	op->below = originator->below;	1336	op->below = originator->below;
1252		1337
1253	if (op->below)	1338	if (op->below)
1254	op->below->above = op;	1339	op->below->above = op;
1255	else	1340	else
1256	op->ms ().bot = op;	1341	ms.bot = op;
1257		1342
1258	/* since *below* originator, no need to update top */	1343	/* since *below* originator, no need to update top */
1259	originator->below = op;	1344	originator->below = op;
1260	}	1345	}
1261	else	1346	else
1262	{	1347	{
		1348	object *top, *floor = NULL;
		1349
		1350	top = ms.bot;
		1351
1263	/* If there are other objects, then */	1352	/* If there are other objects, then */
1264	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1353	if (top)
1265	{	1354	{
1266	object *last = 0;	1355	object *last = 0;
1267		1356
1268	/*	1357	/*
1269	* If there are multiple objects on this space, we do some trickier handling.	1358	* If there are multiple objects on this space, we do some trickier handling.
…		…
1275	* once we get to them. This reduces the need to traverse over all of	1364	* once we get to them. This reduces the need to traverse over all of
1276	* them when adding another one - this saves quite a bit of cpu time	1365	* them when adding another one - this saves quite a bit of cpu time
1277	* when lots of spells are cast in one area. Currently, it is presumed	1366	* when lots of spells are cast in one area. Currently, it is presumed
1278	* that flying non pickable objects are spell objects.	1367	* that flying non pickable objects are spell objects.
1279	*/	1368	*/
1280	while (top)	1369	for (top = ms.bot; top; top = top->above)
1281	{	1370	{
1282	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1371	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283	floor = top;	1372	floor = top;
1284		1373
1285	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1374	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1288	top = top->below;	1377	top = top->below;
1289	break;	1378	break;
1290	}	1379	}
1291		1380
1292	last = top;	1381	last = top;
1293	top = top->above;
1294	}	1382	}
1295		1383
1296	/* Don't want top to be NULL, so set it to the last valid object */	1384	/* Don't want top to be NULL, so set it to the last valid object */
1297	top = last;	1385	top = last;
1298		1386
…		…
1300	* looks like instead of lots of conditions here.	1388	* looks like instead of lots of conditions here.
1301	* makes things faster, and effectively the same result.	1389	* makes things faster, and effectively the same result.
1302	*/	1390	*/
1303		1391
1304	/* Have object 'fall below' other objects that block view.	1392	/* Have object 'fall below' other objects that block view.
1305	* Unless those objects are exits, type 66	1393	* Unless those objects are exits.
1306	* If INS_ON_TOP is used, don't do this processing	1394	* If INS_ON_TOP is used, don't do this processing
1307	* Need to find the object that in fact blocks view, otherwise	1395	* Need to find the object that in fact blocks view, otherwise
1308	* stacking is a bit odd.	1396	* stacking is a bit odd.
1309	*/	1397	*/
1310	if (!(flag & INS_ON_TOP) &&	1398	if (!(flag & INS_ON_TOP)
1311	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1399	&& ms.flags () & P_BLOCKSVIEW
		1400	&& (op->face && !faces [op->face].visibility))
1312	{	1401	{
1313	for (last = top; last != floor; last = last->below)	1402	for (last = top; last != floor; last = last->below)
1314	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315	break;	1404	break;
		1405
1316	/* Check to see if we found the object that blocks view,	1406	/* Check to see if we found the object that blocks view,
1317	* and make sure we have a below pointer for it so that	1407	* and make sure we have a below pointer for it so that
1318	* we can get inserted below this one, which requires we	1408	* we can get inserted below this one, which requires we
1319	* set top to the object below us.	1409	* set top to the object below us.
1320	*/	1410	*/
1321	if (last && last->below && last != floor)	1411	if (last && last->below && last != floor)
1322	top = last->below;	1412	top = last->below;
1323	}	1413	}
1324	} /* If objects on this space */	1414	} /* If objects on this space */
1325		1415
1326	if (flag & INS_MAP_LOAD)
1327	top = GET_MAP_TOP (op->map, op->x, op->y);
1328
1329	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1330	top = floor;	1417	top = floor;
1331		1418
1332	/* Top is the object that our object (op) is going to get inserted above.	1419	/* Top is the object that our object (op) is going to get inserted above.
1333	*/	1420	*/
1334		1421
1335	/* First object on this space */	1422	/* First object on this space */
1336	if (!top)	1423	if (!top)
1337	{	1424	{
1338	op->above = GET_MAP_OB (op->map, op->x, op->y);	1425	op->above = ms.bot;
1339		1426
1340	if (op->above)	1427	if (op->above)
1341	op->above->below = op;	1428	op->above->below = op;
1342		1429
1343	op->below = 0;	1430	op->below = 0;
1344	op->ms ().bot = op;	1431	ms.bot = op;
1345	}	1432	}
1346	else	1433	else
1347	{ /* get inserted into the stack above top */	1434	{ /* get inserted into the stack above top */
1348	op->above = top->above;	1435	op->above = top->above;
1349		1436
…		…
1353	op->below = top;	1440	op->below = top;
1354	top->above = op;	1441	top->above = op;
1355	}	1442	}
1356		1443
1357	if (!op->above)	1444	if (!op->above)
1358	op->ms ().top = op;	1445	ms.top = op;
1359	} /* else not INS_BELOW_ORIGINATOR */	1446	} /* else not INS_BELOW_ORIGINATOR */
1360		1447
1361	if (op->type == PLAYER)	1448	if (op->type == PLAYER)
1362	{	1449	{
1363	op->contr->do_los = 1;	1450	op->contr->do_los = 1;
1364	++op->map->players;	1451	++op->map->players;
1365	op->map->last_access = runtime;	1452	op->map->touch ();
1366	}	1453	}
1367		1454
1368	/* If we have a floor, we know the player, if any, will be above	1455	op->map->dirty = true;
1369	* it, so save a few ticks and start from there.	1456
1370	*/
1371	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = op->ms ().player ())	1457	if (object *pl = ms.player ())
		1458	//TODO: the floorbox prev/next might need updating
		1459	//esrv_send_item (pl, op);
		1460	//TODO: update floorbox to preserve ordering
1373	if (pl->contr->ns)	1461	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1462	pl->contr->ns->floorbox_update ();
1375		1463
1376	/* If this object glows, it may affect lighting conditions that are	1464	/* If this object glows, it may affect lighting conditions that are
1377	* visible to others on this map. But update_all_los is really	1465	* visible to others on this map. But update_all_los is really
1378	* an inefficient way to do this, as it means los for all players	1466	* an inefficient way to do this, as it means los for all players
1379	* on the map will get recalculated. The players could very well	1467	* on the map will get recalculated. The players could very well
1380	* be far away from this change and not affected in any way -	1468	* be far away from this change and not affected in any way -
1381	* this should get redone to only look for players within range,	1469	* this should get redone to only look for players within range,
1382	* or just updating the P_NEED_UPDATE for spaces within this area	1470	* or just updating the P_UPTODATE for spaces within this area
1383	* of effect may be sufficient.	1471	* of effect may be sufficient.
1384	*/	1472	*/
1385	if (op->map->darkness && (op->glow_radius != 0))	1473	if (op->map->darkness && (op->glow_radius != 0))
1386	update_all_los (op->map, op->x, op->y);	1474	update_all_los (op->map, op->x, op->y);
1387		1475
…		…
1398	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1399	* update_object().	1487	* update_object().
1400	*/	1488	*/
1401		1489
1402	/* if this is not the head or flag has been passed, don't check walk on status */	1490	/* if this is not the head or flag has been passed, don't check walk on status */
1403	if (!(flag & INS_NO_WALK_ON) && !op->head)	1491	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404	{	1492	{
1405	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1406	return 0;	1494	return 0;
1407		1495
1408	/* If we are a multi part object, lets work our way through the check	1496	/* If we are a multi part object, lets work our way through the check
1409	* walk on's.	1497	* walk on's.
1410	*/	1498	*/
1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1499	for (object *tmp = op->more; tmp; tmp = tmp->more)
1412	if (check_move_on (tmp, originator))	1500	if (check_move_on (tmp, originator))
1413	return 0;	1501	return 0;
1414	}	1502	}
1415		1503
1416	return op;	1504	return op;
…		…
1421	* op is the object to insert it under: supplies x and the map.	1509	* op is the object to insert it under: supplies x and the map.
1422	*/	1510	*/
1423	void	1511	void
1424	replace_insert_ob_in_map (const char *arch_string, object *op)	1512	replace_insert_ob_in_map (const char *arch_string, object *op)
1425	{	1513	{
1426	object *tmp, *tmp1;
1427
1428	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1429		1515
1430	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432	tmp->destroy ();	1518	tmp->destroy (1);
1433		1519
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1520	object *tmp = arch_to_object (archetype::find (arch_string));
1435		1521
1436	tmp1->x = op->x;	1522	tmp->x = op->x;
1437	tmp1->y = op->y;	1523	tmp->y = op->y;
		1524
1438	insert_ob_in_map (tmp1, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
1439	}	1526	}
1440		1527
1441	object *	1528	object *
1442	object::insert_at (object *where, object *originator, int flags)	1529	object::insert_at (object *where, object *originator, int flags)
1443	{	1530	{
		1531	if (where->env)
		1532	return where->env->insert (this);
		1533	else
1444	where->map->insert (this, where->x, where->y, originator, flags);	1534	return where->map->insert (this, where->x, where->y, originator, flags);
1445	}	1535	}
1446		1536
1447	/*	1537	/*
1448	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1449	* is returned contains nr objects, and the remaining parts contains
1450	* the rest (or is removed and freed if that number is 0).
1451	* On failure, NULL is returned, and the reason put into the
1452	* global static errmsg array.
1453	*/
1454	object *
1455	get_split_ob (object *orig_ob, uint32 nr)
1456	{
1457	object *newob;
1458	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1459
1460	if (orig_ob->nrof < nr)
1461	{
1462	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1463	return NULL;
1464	}
1465
1466	newob = object_create_clone (orig_ob);
1467
1468	if ((orig_ob->nrof -= nr) < 1)
1469	orig_ob->destroy (1);
1470	else if (!is_removed)
1471	{
1472	if (orig_ob->env != NULL)
1473	sub_weight (orig_ob->env, orig_ob->weight * nr);
1474	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1475	{
1476	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1477	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1478	return NULL;
1479	}
1480	}
1481
1482	newob->nrof = nr;
1483
1484	return newob;
1485	}
1486
1487	/*
1488	* decrease_ob_nr(object, number) decreases a specified number from	1538	* decrease(object, number) decreases a specified number from
1489	* the amount of an object. If the amount reaches 0, the object	1539	* the amount of an object. If the amount reaches 0, the object
1490	* is subsequently removed and freed.	1540	* is subsequently removed and freed.
1491	*	1541	*
1492	* Return value: 'op' if something is left, NULL if the amount reached 0	1542	* Return value: 'op' if something is left, NULL if the amount reached 0
1493	*/	1543	*/
		1544	bool
		1545	object::decrease (sint32 nr)
		1546	{
		1547	if (!nr)
		1548	return true;
1494		1549
		1550	nr = min (nr, nrof);
		1551
		1552	nrof -= nr;
		1553
		1554	if (nrof)
		1555	{
		1556	adjust_weight (env, -weight * nr); // carrying == 0
		1557
		1558	if (object *pl = visible_to ())
		1559	esrv_update_item (UPD_NROF, pl, this);
		1560
		1561	return true;
		1562	}
		1563	else
		1564	{
		1565	destroy (1);
		1566	return false;
		1567	}
		1568	}
		1569
		1570	/*
		1571	* split(ob,nr) splits up ob into two parts. The part which
		1572	* is returned contains nr objects, and the remaining parts contains
		1573	* the rest (or is removed and returned if that number is 0).
		1574	* On failure, NULL is returned.
		1575	*/
1495	object *	1576	object *
1496	decrease_ob_nr (object *op, uint32 i)	1577	object::split (sint32 nr)
1497	{	1578	{
1498	object *tmp;	1579	int have = number_of ();
1499		1580
1500	if (i == 0) /* objects with op->nrof require this check */	1581	if (have < nr)
1501	return op;	1582	return 0;
1502		1583	else if (have == nr)
1503	if (i > op->nrof)
1504	i = op->nrof;
1505
1506	if (QUERY_FLAG (op, FLAG_REMOVED))
1507	op->nrof -= i;
1508	else if (op->env)
1509	{	1584	{
1510	/* is this object in the players inventory, or sub container
1511	* therein?
1512	*/
1513	tmp = op->in_player ();
1514	/* nope. Is this a container the player has opened?
1515	* If so, set tmp to that player.
1516	* IMO, searching through all the players will mostly
1517	* likely be quicker than following op->env to the map,
1518	* and then searching the map for a player.
1519	*/
1520	if (!tmp)
1521	for_all_players (pl)
1522	if (pl->ob->container == op->env)
1523	{
1524	tmp = pl->ob;
1525	break;
1526	}
1527
1528	if (i < op->nrof)
1529	{
1530	sub_weight (op->env, op->weight * i);
1531	op->nrof -= i;
1532	if (tmp)
1533	esrv_send_item (tmp, op);
1534	}
1535	else
1536	{
1537	op->remove ();	1585	remove ();
1538	op->nrof = 0;	1586	return this;
1539	if (tmp)
1540	esrv_del_item (tmp->contr, op->count);
1541	}
1542	}	1587	}
1543	else	1588	else
1544	{	1589	{
1545	object *above = op->above;	1590	decrease (nr);
1546		1591
1547	if (i < op->nrof)	1592	object *op = deep_clone ();
1548	op->nrof -= i;	1593	op->nrof = nr;
1549	else
1550	{
1551	op->remove ();
1552	op->nrof = 0;
1553	}
1554
1555	/* Since we just removed op, op->above is null */
1556	for (tmp = above; tmp; tmp = tmp->above)
1557	if (tmp->type == PLAYER)
1558	{
1559	if (op->nrof)
1560	esrv_send_item (tmp, op);
1561	else
1562	esrv_del_item (tmp->contr, op->count);
1563	}
1564	}
1565
1566	if (op->nrof)
1567	return op;	1594	return op;
1568	else
1569	{
1570	op->destroy ();
1571	return 0;
1572	}
1573	}
1574
1575	/*
1576	* add_weight(object, weight) adds the specified weight to an object,
1577	* and also updates how much the environment(s) is/are carrying.
1578	*/
1579
1580	void
1581	add_weight (object *op, signed long weight)
1582	{
1583	while (op != NULL)
1584	{
1585	if (op->type == CONTAINER)
1586	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1587
1588	op->carrying += weight;
1589	op = op->env;
1590	}	1595	}
1591	}	1596	}
1592		1597
1593	object *	1598	object *
1594	insert_ob_in_ob (object *op, object *where)	1599	insert_ob_in_ob (object *op, object *where)
…		…
1599	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1604	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1600	free (dump);	1605	free (dump);
1601	return op;	1606	return op;
1602	}	1607	}
1603		1608
1604	if (where->head)	1609	if (where->head_ () != where)
1605	{	1610	{
1606	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1611	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1607	where = where->head;	1612	where = where->head;
1608	}	1613	}
1609		1614
1610	return where->insert (op);	1615	return where->insert (op);
1611	}	1616	}
…		…
1616	* inside the object environment.	1621	* inside the object environment.
1617	*	1622	*
1618	* The function returns now pointer to inserted item, and return value can	1623	* The function returns now pointer to inserted item, and return value can
1619	* be != op, if items are merged. -Tero	1624	* be != op, if items are merged. -Tero
1620	*/	1625	*/
1621
1622	object *	1626	object *
1623	object::insert (object *op)	1627	object::insert (object *op)
1624	{	1628	{
1625	object *tmp, *otmp;
1626
1627	if (!QUERY_FLAG (op, FLAG_REMOVED))
1628	op->remove ();
1629
1630	if (op->more)	1629	if (op->more)
1631	{	1630	{
1632	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1631	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1633	return op;	1632	return op;
1634	}	1633	}
1635		1634
1636	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1635	op->remove ();
1637	CLEAR_FLAG (op, FLAG_REMOVED);	1636
		1637	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1638
1638	if (op->nrof)	1639	if (op->nrof)
1639	{
1640	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1640	for (object *tmp = inv; tmp; tmp = tmp->below)
1641	if (object::can_merge (tmp, op))	1641	if (object::can_merge (tmp, op))
1642	{	1642	{
1643	/* return the original object and remove inserted object	1643	/* return the original object and remove inserted object
1644	(client needs the original object) */	1644	(client needs the original object) */
1645	tmp->nrof += op->nrof;	1645	tmp->nrof += op->nrof;
1646	/* Weight handling gets pretty funky. Since we are adding to	1646
1647	* tmp->nrof, we need to increase the weight.	1647	if (object *pl = tmp->visible_to ())
1648	*/	1648	esrv_update_item (UPD_NROF, pl, tmp);
		1649
1649	add_weight (this, op->weight * op->nrof);	1650	adjust_weight (this, op->total_weight ());
1650	SET_FLAG (op, FLAG_REMOVED);	1651
1651	op->destroy (); /* free the inserted object */	1652	op->destroy (1);
1652	op = tmp;	1653	op = tmp;
1653	op->remove (); /* and fix old object's links */	1654	goto inserted;
1654	CLEAR_FLAG (op, FLAG_REMOVED);
1655	break;
1656	}	1655	}
1657		1656
1658	/* I assume combined objects have no inventory	1657	op->owner = 0; // it's his/hers now. period.
1659	* We add the weight - this object could have just been removed
1660	* (if it was possible to merge). calling remove_ob will subtract
1661	* the weight, so we need to add it in again, since we actually do
1662	* the linking below
1663	*/
1664	add_weight (this, op->weight * op->nrof);
1665	}
1666	else
1667	add_weight (this, (op->weight + op->carrying));
1668
1669	otmp = this->in_player ();
1670	if (otmp && otmp->contr)
1671	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1672	otmp->update_stats ();
1673
1674	op->map = 0;	1658	op->map = 0;
1675	op->env = this;	1659	op->x = 0;
		1660	op->y = 0;
		1661
1676	op->above = 0;	1662	op->above = 0;
1677	op->below = 0;	1663	op->below = inv;
1678	op->x = 0, op->y = 0;	1664	op->env = this;
1679		1665
		1666	if (inv)
		1667	inv->above = op;
		1668
		1669	inv = op;
		1670
		1671	op->flag [FLAG_REMOVED] = 0;
		1672
		1673	if (object *pl = op->visible_to ())
		1674	esrv_send_item (pl, op);
		1675
		1676	adjust_weight (this, op->total_weight ());
		1677
		1678	inserted:
1680	/* reset the light list and los of the players on the map */	1679	/* reset the light list and los of the players on the map */
1681	if ((op->glow_radius != 0) && map)	1680	if (op->glow_radius && map && map->darkness)
1682	{
1683	#ifdef DEBUG_LIGHTS
1684	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1685	#endif /* DEBUG_LIGHTS */
1686	if (map->darkness)
1687	update_all_los (map, x, y);	1681	update_all_los (map, x, y);
1688	}
1689		1682
1690	/* Client has no idea of ordering so lets not bother ordering it here.	1683	// if this is a player's inventory, update stats
1691	* It sure simplifies this function...	1684	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1692	*/	1685	update_stats ();
1693	if (!inv)
1694	inv = op;
1695	else
1696	{
1697	op->below = inv;
1698	op->below->above = op;
1699	inv = op;
1700	}
1701		1686
1702	INVOKE_OBJECT (INSERT, this);	1687	INVOKE_OBJECT (INSERT, this);
1703		1688
1704	return op;	1689	return op;
1705	}	1690	}
…		…
1758		1743
1759	/* The objects have to be checked from top to bottom.	1744	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1745	* Hence, we first go to the top:
1761	*/	1746	*/
1762		1747
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1748	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1749	{
1765	/* Trim the search when we find the first other spell effect	1750	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1751	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1752	* we don't need to check all of them.
1768	*/	1753	*/
…		…
1786	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1771	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1772	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788	{	1773	{
1789		1774
1790	float	1775	float
1791	diff = tmp->move_slow_penalty * FABS (op->speed);	1776	diff = tmp->move_slow_penalty * fabs (op->speed);
1792		1777
1793	if (op->type == PLAYER)	1778	if (op->type == PLAYER)
1794	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1779	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1795	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1780	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796	diff /= 4.0;	1781	diff /= 4.0;
…		…
1826	* The first matching object is returned, or NULL if none.	1811	* The first matching object is returned, or NULL if none.
1827	*/	1812	*/
1828	object *	1813	object *
1829	present_arch (const archetype *at, maptile *m, int x, int y)	1814	present_arch (const archetype *at, maptile *m, int x, int y)
1830	{	1815	{
1831	if (m == NULL || out_of_map (m, x, y))	1816	if (!m || out_of_map (m, x, y))
1832	{	1817	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1819	return NULL;
1835	}	1820	}
1836		1821
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1823	if (tmp->arch->archname == at->archname)
1839	return tmp;	1824	return tmp;
1840		1825
1841	return NULL;	1826	return NULL;
1842	}	1827	}
1843		1828
…		…
1853	{	1838	{
1854	LOG (llevError, "Present called outside map.\n");	1839	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1840	return NULL;
1856	}	1841	}
1857		1842
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1843	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1844	if (tmp->type == type)
1860	return tmp;	1845	return tmp;
1861		1846
1862	return NULL;	1847	return NULL;
1863	}	1848	}
…		…
1907	* The first matching object is returned, or NULL if none.	1892	* The first matching object is returned, or NULL if none.
1908	*/	1893	*/
1909	object *	1894	object *
1910	present_arch_in_ob (const archetype *at, const object *op)	1895	present_arch_in_ob (const archetype *at, const object *op)
1911	{	1896	{
1912	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1913	if (tmp->arch == at)	1898	if (tmp->arch->archname == at->archname)
1914	return tmp;	1899	return tmp;
1915		1900
1916	return NULL;	1901	return NULL;
1917	}	1902	}
1918		1903
…		…
1920	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
1921	*/	1906	*/
1922	void	1907	void
1923	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
1924	{	1909	{
1925	if (op->inv)
1926	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1910	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1927	{	1911	{
1928	SET_FLAG (tmp, flag);	1912	SET_FLAG (tmp, flag);
1929	flag_inv (tmp, flag);	1913	flag_inv (tmp, flag);
1930	}	1914	}
1931	}	1915	}
1932		1916
1933	/*	1917	/*
1934	* deactivate recursively a flag on an object inventory	1918	* deactivate recursively a flag on an object inventory
1935	*/	1919	*/
1936	void	1920	void
1937	unflag_inv (object *op, int flag)	1921	unflag_inv (object *op, int flag)
1938	{	1922	{
1939	if (op->inv)
1940	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1941	{	1924	{
1942	CLEAR_FLAG (tmp, flag);	1925	CLEAR_FLAG (tmp, flag);
1943	unflag_inv (tmp, flag);	1926	unflag_inv (tmp, flag);
1944	}	1927	}
1945	}
1946
1947	/*
1948	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1949	* all it's inventory (recursively).
1950	* If checksums are used, a player will get set_cheat called for
1951	* him/her-self and all object carried by a call to this function.
1952	*/
1953	void
1954	set_cheat (object *op)
1955	{
1956	SET_FLAG (op, FLAG_WAS_WIZ);
1957	flag_inv (op, FLAG_WAS_WIZ);
1958	}	1928	}
1959		1929
1960	/*	1930	/*
1961	* find_free_spot(object, map, x, y, start, stop) will search for	1931	* find_free_spot(object, map, x, y, start, stop) will search for
1962	* a spot at the given map and coordinates which will be able to contain	1932	* a spot at the given map and coordinates which will be able to contain
…		…
1964	* to search (see the freearr_x/y[] definition).	1934	* to search (see the freearr_x/y[] definition).
1965	* It returns a random choice among the alternatives found.	1935	* It returns a random choice among the alternatives found.
1966	* start and stop are where to start relative to the free_arr array (1,9	1936	* start and stop are where to start relative to the free_arr array (1,9
1967	* does all 4 immediate directions). This returns the index into the	1937	* does all 4 immediate directions). This returns the index into the
1968	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1938	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1969	* Note - this only checks to see if there is space for the head of the
1970	* object - if it is a multispace object, this should be called for all
1971	* pieces.
1972	* Note2: This function does correctly handle tiled maps, but does not	1939	* Note: This function does correctly handle tiled maps, but does not
1973	* inform the caller. However, insert_ob_in_map will update as	1940	* inform the caller. However, insert_ob_in_map will update as
1974	* necessary, so the caller shouldn't need to do any special work.	1941	* necessary, so the caller shouldn't need to do any special work.
1975	* Note - updated to take an object instead of archetype - this is necessary	1942	* Note - updated to take an object instead of archetype - this is necessary
1976	* because arch_blocked (now ob_blocked) needs to know the movement type	1943	* because arch_blocked (now ob_blocked) needs to know the movement type
1977	* to know if the space in question will block the object. We can't use	1944	* to know if the space in question will block the object. We can't use
…		…
1979	* customized, changed states, etc.	1946	* customized, changed states, etc.
1980	*/	1947	*/
1981	int	1948	int
1982	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1949	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1983	{	1950	{
		1951	int altern[SIZEOFFREE];
1984	int index = 0, flag;	1952	int index = 0, flag;
1985	int altern[SIZEOFFREE];
1986		1953
1987	for (int i = start; i < stop; i++)	1954	for (int i = start; i < stop; i++)
1988	{	1955	{
1989	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1956	mapxy pos (m, x, y); pos.move (i);
1990	if (!flag)	1957
		1958	if (!pos.normalise ())
		1959	continue;
		1960
		1961	mapspace &ms = *pos;
		1962
		1963	if (ms.flags () & P_IS_ALIVE)
		1964	continue;
		1965
		1966	/* However, often
		1967	* ob doesn't have any move type (when used to place exits)
		1968	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1969	*/
		1970	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1971	{
1991	altern [index++] = i;	1972	altern [index++] = i;
		1973	continue;
		1974	}
1992		1975
1993	/* Basically, if we find a wall on a space, we cut down the search size.	1976	/* Basically, if we find a wall on a space, we cut down the search size.
1994	* In this way, we won't return spaces that are on another side of a wall.	1977	* In this way, we won't return spaces that are on another side of a wall.
1995	* This mostly work, but it cuts down the search size in all directions -	1978	* This mostly work, but it cuts down the search size in all directions -
1996	* if the space being examined only has a wall to the north and empty	1979	* if the space being examined only has a wall to the north and empty
1997	* spaces in all the other directions, this will reduce the search space	1980	* spaces in all the other directions, this will reduce the search space
1998	* to only the spaces immediately surrounding the target area, and	1981	* to only the spaces immediately surrounding the target area, and
1999	* won't look 2 spaces south of the target space.	1982	* won't look 2 spaces south of the target space.
2000	*/	1983	*/
2001	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1984	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1985	{
2002	stop = maxfree[i];	1986	stop = maxfree[i];
		1987	continue;
		1988	}
		1989
		1990	/* Note it is intentional that we check ob - the movement type of the
		1991	* head of the object should correspond for the entire object.
		1992	*/
		1993	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1994	continue;
		1995
		1996	if (ob->blocked (m, pos.x, pos.y))
		1997	continue;
		1998
		1999	altern [index++] = i;
2003	}	2000	}
2004		2001
2005	if (!index)	2002	if (!index)
2006	return -1;	2003	return -1;
2007		2004
2008	return altern[RANDOM () % index];	2005	return altern [rndm (index)];
2009	}	2006	}
2010		2007
2011	/*	2008	/*
2012	* find_first_free_spot(archetype, maptile, x, y) works like	2009	* find_first_free_spot(archetype, maptile, x, y) works like
2013	* find_free_spot(), but it will search max number of squares.	2010	* find_free_spot(), but it will search max number of squares.
…		…
2016	*/	2013	*/
2017	int	2014	int
2018	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2015	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2019	{	2016	{
2020	for (int i = 0; i < SIZEOFFREE; i++)	2017	for (int i = 0; i < SIZEOFFREE; i++)
2021	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2018	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2022	return i;	2019	return i;
2023		2020
2024	return -1;	2021	return -1;
2025	}	2022	}
2026		2023
…		…
2034	{	2031	{
2035	arr += begin;	2032	arr += begin;
2036	end -= begin;	2033	end -= begin;
2037		2034
2038	while (--end)	2035	while (--end)
2039	swap (arr [end], arr [RANDOM () % (end + 1)]);	2036	swap (arr [end], arr [rndm (end + 1)]);
2040	}	2037	}
2041		2038
2042	/* new function to make monster searching more efficient, and effective!	2039	/* new function to make monster searching more efficient, and effective!
2043	* This basically returns a randomized array (in the passed pointer) of	2040	* This basically returns a randomized array (in the passed pointer) of
2044	* the spaces to find monsters. In this way, it won't always look for	2041	* the spaces to find monsters. In this way, it won't always look for
…		…
2080	object *tmp;	2077	object *tmp;
2081	maptile *mp;	2078	maptile *mp;
2082		2079
2083	MoveType blocked, move_type;	2080	MoveType blocked, move_type;
2084		2081
2085	if (exclude && exclude->head)	2082	if (exclude && exclude->head_ () != exclude)
2086	{	2083	{
2087	exclude = exclude->head;	2084	exclude = exclude->head;
2088	move_type = exclude->move_type;	2085	move_type = exclude->move_type;
2089	}	2086	}
2090	else	2087	else
…		…
2113	max = maxfree[i];	2110	max = maxfree[i];
2114	else if (mflags & P_IS_ALIVE)	2111	else if (mflags & P_IS_ALIVE)
2115	{	2112	{
2116	for (tmp = ms.bot; tmp; tmp = tmp->above)	2113	for (tmp = ms.bot; tmp; tmp = tmp->above)
2117	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2114	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2115	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119	break;	2116	break;
2120		2117
2121	if (tmp)	2118	if (tmp)
2122	return freedir[i];	2119	return freedir[i];
2123	}	2120	}
…		…
2178		2175
2179	return 3;	2176	return 3;
2180	}	2177	}
2181		2178
2182	/*	2179	/*
2183	* absdir(int): Returns a number between 1 and 8, which represent
2184	* the "absolute" direction of a number (it actually takes care of
2185	* "overflow" in previous calculations of a direction).
2186	*/
2187
2188	int
2189	absdir (int d)
2190	{
2191	while (d < 1)
2192	d += 8;
2193
2194	while (d > 8)
2195	d -= 8;
2196
2197	return d;
2198	}
2199
2200	/*
2201	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2180	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2181	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2182	*/
2204
2205	int	2183	int
2206	dirdiff (int dir1, int dir2)	2184	dirdiff (int dir1, int dir2)
2207	{	2185	{
2208	int d;	2186	int d;
2209		2187
…		…
2322	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2300	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2323	* core dumps if they do.	2301	* core dumps if they do.
2324	*	2302	*
2325	* Add a check so we can't pick up invisible objects (0.93.8)	2303	* Add a check so we can't pick up invisible objects (0.93.8)
2326	*/	2304	*/
2327
2328	int	2305	int
2329	can_pick (const object *who, const object *item)	2306	can_pick (const object *who, const object *item)
2330	{	2307	{
2331	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2308	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2309	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2335		2312
2336	/*	2313	/*
2337	* create clone from object to another	2314	* create clone from object to another
2338	*/	2315	*/
2339	object *	2316	object *
2340	object_create_clone (object *asrc)	2317	object::deep_clone ()
2341	{	2318	{
2342	object *dst = 0, *tmp, *src, *part, *prev, *item;	2319	assert (("deep_clone called on non-head object", is_head ()));
2343		2320
2344	if (!asrc)	2321	object *dst = clone ();
2345	return 0;
2346		2322
2347	src = asrc;	2323	object *prev = dst;
2348	if (src->head)
2349	src = src->head;
2350
2351	prev = 0;
2352	for (part = src; part; part = part->more)	2324	for (object *part = this->more; part; part = part->more)
2353	{	2325	{
2354	tmp = part->clone ();	2326	object *tmp = part->clone ();
2355	tmp->x -= src->x;
2356	tmp->y -= src->y;
2357
2358	if (!part->head)
2359	{
2360	dst = tmp;
2361	tmp->head = 0;
2362	}
2363	else
2364	tmp->head = dst;	2327	tmp->head = dst;
2365
2366	tmp->more = 0;
2367
2368	if (prev)
2369	prev->more = tmp;	2328	prev->more = tmp;
2370
2371	prev = tmp;	2329	prev = tmp;
2372	}	2330	}
2373		2331
2374	for (item = src->inv; item; item = item->below)	2332	for (object *item = inv; item; item = item->below)
2375	insert_ob_in_ob (object_create_clone (item), dst);	2333	insert_ob_in_ob (item->deep_clone (), dst);
2376		2334
2377	return dst;	2335	return dst;
2378	}
2379
2380	/* GROS - Creates an object using a string representing its content. */
2381	/* Basically, we save the content of the string to a temp file, then call */
2382	/* load_object on it. I admit it is a highly inefficient way to make things, */
2383	/* but it was simple to make and allows reusing the load_object function. */
2384	/* Remember not to use load_object_str in a time-critical situation. */
2385	/* Also remember that multiparts objects are not supported for now. */
2386	object *
2387	load_object_str (const char *obstr)
2388	{
2389	object *op;
2390	char filename[MAX_BUF];
2391
2392	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394	FILE *tempfile = fopen (filename, "w");
2395
2396	if (tempfile == NULL)
2397	{
2398	LOG (llevError, "Error - Unable to access load object temp file\n");
2399	return NULL;
2400	}
2401
2402	fprintf (tempfile, obstr);
2403	fclose (tempfile);
2404
2405	op = object::create ();
2406
2407	object_thawer thawer (filename);
2408
2409	if (thawer)
2410	load_object (thawer, op, 0);
2411
2412	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413	CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415	return op;
2416	}	2336	}
2417		2337
2418	/* This returns the first object in who's inventory that	2338	/* This returns the first object in who's inventory that
2419	* has the same type and subtype match.	2339	* has the same type and subtype match.
2420	* returns NULL if no match.	2340	* returns NULL if no match.
…		…
2427	return tmp;	2347	return tmp;
2428		2348
2429	return 0;	2349	return 0;
2430	}	2350	}
2431		2351
2432	/* If ob has a field named key, return the link from the list,	2352	const shstr &
2433	* otherwise return NULL.	2353	object::kv_get (const shstr &key) const
2434	*
2435	* key must be a passed in shared string - otherwise, this won't
2436	* do the desired thing.
2437	*/
2438	key_value *
2439	get_ob_key_link (const object *ob, const char *key)
2440	{	2354	{
2441	for (key_value *link = ob->key_values; link; link = link->next)	2355	for (key_value *kv = key_values; kv; kv = kv->next)
2442	if (link->key == key)	2356	if (kv->key == key)
2443	return link;
2444
2445	return 0;
2446	}
2447
2448	/*
2449	* Returns the value of op has an extra_field for key, or NULL.
2450	*
2451	* The argument doesn't need to be a shared string.
2452	*
2453	* The returned string is shared.
2454	*/
2455	const char *
2456	get_ob_key_value (const object *op, const char *const key)
2457	{
2458	key_value *link;
2459	shstr_cmp canonical_key (key);
2460
2461	if (!canonical_key)
2462	{
2463	/* 1. There being a field named key on any object
2464	* implies there'd be a shared string to find.
2465	* 2. Since there isn't, no object has this field.
2466	* 3. Therefore, *this* object doesn't have this field.
2467	*/
2468	return 0;
2469	}
2470
2471	/* This is copied from get_ob_key_link() above -
2472	* only 4 lines, and saves the function call overhead.
2473	*/
2474	for (link = op->key_values; link; link = link->next)
2475	if (link->key == canonical_key)
2476	return link->value;	2357	return kv->value;
2477		2358
2478	return 0;	2359	return shstr_null;
2479	}	2360	}
2480		2361
2481		2362	void
2482	/*	2363	object::kv_set (const shstr &key, const shstr &value)
2483	* Updates the canonical_key in op to value.
2484	*
2485	* canonical_key is a shared string (value doesn't have to be).
2486	*
2487	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2488	* keys.
2489	*
2490	* Returns TRUE on success.
2491	*/
2492	int
2493	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2494	{	2364	{
2495	key_value *field = NULL, *last = NULL;	2365	for (key_value *kv = key_values; kv; kv = kv->next)
2496		2366	if (kv->key == key)
2497	for (field = op->key_values; field != NULL; field = field->next)
2498	{
2499	if (field->key != canonical_key)
2500	{	2367	{
2501	last = field;	2368	kv->value = value;
2502	continue;	2369	return;
2503	}	2370	}
2504		2371
2505	if (value)	2372	key_value *kv = new key_value;
2506	field->value = value;	2373
2507	else	2374	kv->next = key_values;
		2375	kv->key = key;
		2376	kv->value = value;
		2377
		2378	key_values = kv;
		2379	}
		2380
		2381	void
		2382	object::kv_del (const shstr &key)
		2383	{
		2384	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2385	if ((*kvp)->key == key)
2508	{	2386	{
2509	/* Basically, if the archetype has this key set,	2387	key_value *kv = *kvp;
2510	* we need to store the null value so when we save	2388	*kvp = (*kvp)->next;
2511	* it, we save the empty value so that when we load,	2389	delete kv;
2512	* we get this value back again.	2390	return;
2513	*/
2514	if (get_ob_key_link (&op->arch->clone, canonical_key))
2515	field->value = 0;
2516	else
2517	{
2518	if (last)
2519	last->next = field->next;
2520	else
2521	op->key_values = field->next;
2522
2523	delete field;
2524	}
2525	}	2391	}
2526	return TRUE;
2527	}
2528	/* IF we get here, key doesn't exist */
2529
2530	/* No field, we'll have to add it. */
2531
2532	if (!add_key)
2533	return FALSE;
2534
2535	/* There isn't any good reason to store a null
2536	* value in the key/value list. If the archetype has
2537	* this key, then we should also have it, so shouldn't
2538	* be here. If user wants to store empty strings,
2539	* should pass in ""
2540	*/
2541	if (value == NULL)
2542	return TRUE;
2543
2544	field = new key_value;
2545
2546	field->key = canonical_key;
2547	field->value = value;
2548	/* Usual prepend-addition. */
2549	field->next = op->key_values;
2550	op->key_values = field;
2551
2552	return TRUE;
2553	}
2554
2555	/*
2556	* Updates the key in op to value.
2557	*
2558	* If add_key is FALSE, this will only update existing keys,
2559	* and not add new ones.
2560	* In general, should be little reason FALSE is ever passed in for add_key
2561	*
2562	* Returns TRUE on success.
2563	*/
2564	int
2565	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2566	{
2567	shstr key_ (key);
2568
2569	return set_ob_key_value_s (op, key_, value, add_key);
2570	}	2392	}
2571		2393
2572	object::depth_iterator::depth_iterator (object *container)	2394	object::depth_iterator::depth_iterator (object *container)
2573	: iterator_base (container)	2395	: iterator_base (container)
2574	{	2396	{
…		…
2588	}	2410	}
2589	else	2411	else
2590	item = item->env;	2412	item = item->env;
2591	}	2413	}
2592		2414
2593
2594	const char *	2415	const char *
2595	object::flag_desc (char *desc, int len) const	2416	object::flag_desc (char *desc, int len) const
2596	{	2417	{
2597	char *p = desc;	2418	char *p = desc;
2598	bool first = true;	2419	bool first = true;
		2420
		2421	*p = 0;
2599		2422
2600	for (int i = 0; i < NUM_FLAGS; i++)	2423	for (int i = 0; i < NUM_FLAGS; i++)
2601	{	2424	{
2602	if (len <= 10) // magic constant!	2425	if (len <= 10) // magic constant!
2603	{	2426	{
2604	snprintf (p, len, ",...");	2427	snprintf (p, len, ",...");
2605	break;	2428	break;
2606	}	2429	}
2607		2430
2608	if (flag[i])	2431	if (flag [i])
2609	{	2432	{
2610	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);	2433	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611	len -= cnt;	2434	len -= cnt;
2612	p += cnt;	2435	p += cnt;
2613	first = false;	2436	first = false;
…		…
2615	}	2438	}
2616		2439
2617	return desc;	2440	return desc;
2618	}	2441	}
2619		2442
2620	// return a suitable string describing an objetc in enough detail to find it	2443	// return a suitable string describing an object in enough detail to find it
2621	const char *	2444	const char *
2622	object::debug_desc (char *info) const	2445	object::debug_desc (char *info) const
2623	{	2446	{
2624	char flagdesc[512];	2447	char flagdesc[512];
2625	char info2[256 * 4];	2448	char info2[256 * 4];
2626	char *p = info;	2449	char *p = info;
2627		2450
2628	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2451	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629	count, uuid.seq,	2452	count,
		2453	uuid.c_str (),
2630	&name,	2454	&name,
2631	title ? "\",title:" : "",	2455	title ? "\",title:\"" : "",
2632	title ? (const char *)title : "",	2456	title ? (const char *)title : "",
2633	flag_desc (flagdesc, 512), type);	2457	flag_desc (flagdesc, 512), type);
2634		2458
2635	if (env)	2459	if (!flag[FLAG_REMOVED] && env)
2636	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2637		2461
2638	if (map)	2462	if (map)
2639	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2463	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2640		2464
…		…
2642	}	2466	}
2643		2467
2644	const char *	2468	const char *
2645	object::debug_desc () const	2469	object::debug_desc () const
2646	{	2470	{
2647	static char info[256 * 3];	2471	static char info[3][256 * 4];
		2472	static int info_idx;
		2473
2648	return debug_desc (info);	2474	return debug_desc (info [++info_idx % 3]);
2649	}	2475	}
2650		2476
		2477	struct region *
		2478	object::region () const
		2479	{
		2480	return map ? map->region (x, y)
		2481	: region::default_region ();
		2482	}
		2483
		2484	const materialtype_t *
		2485	object::dominant_material () const
		2486	{
		2487	if (materialtype_t *mt = name_to_material (materialname))
		2488	return mt;
		2489
		2490	return name_to_material (shstr_unknown);
		2491	}
		2492
		2493	void
		2494	object::open_container (object *new_container)
		2495	{
		2496	if (container == new_container)
		2497	return;
		2498
		2499	object *old_container = container;
		2500
		2501	if (old_container)
		2502	{
		2503	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2504	return;
		2505
		2506	#if 0
		2507	// remove the "Close old_container" object.
		2508	if (object *closer = old_container->inv)
		2509	if (closer->type == CLOSE_CON)
		2510	closer->destroy ();
		2511	#endif
		2512
		2513	// make sure the container is available
		2514	esrv_send_item (this, old_container);
		2515
		2516	old_container->flag [FLAG_APPLIED] = false;
		2517	container = 0;
		2518
		2519	// client needs item update to make it work, client bug requires this to be separate
		2520	esrv_update_item (UPD_FLAGS, this, old_container);
		2521
		2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2523	play_sound (sound_find ("chest_close"));
		2524	}
		2525
		2526	if (new_container)
		2527	{
		2528	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2529	return;
		2530
		2531	// TODO: this does not seem to serve any purpose anymore?
		2532	#if 0
		2533	// insert the "Close Container" object.
		2534	if (archetype *closer = new_container->other_arch)
		2535	{
		2536	object *closer = arch_to_object (new_container->other_arch);
		2537	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2538	new_container->insert (closer);
		2539	}
		2540	#endif
		2541
		2542	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2543
		2544	// make sure the container is available, client bug requires this to be separate
		2545	esrv_send_item (this, new_container);
		2546
		2547	new_container->flag [FLAG_APPLIED] = true;
		2548	container = new_container;
		2549
		2550	// client needs flag change
		2551	esrv_update_item (UPD_FLAGS, this, new_container);
		2552	esrv_send_inventory (this, new_container);
		2553	play_sound (sound_find ("chest_open"));
		2554	}
		2555	// else if (!old_container->env && contr && contr->ns)
		2556	// contr->ns->floorbox_reset ();
		2557	}
		2558
		2559	object *
		2560	object::force_find (const shstr name)
		2561	{
		2562	/* cycle through his inventory to look for the MARK we want to
		2563	* place
		2564	*/
		2565	for (object *tmp = inv; tmp; tmp = tmp->below)
		2566	if (tmp->type == FORCE && tmp->slaying == name)
		2567	return splay (tmp);
		2568
		2569	return 0;
		2570	}
		2571
		2572	void
		2573	object::force_add (const shstr name, int duration)
		2574	{
		2575	if (object *force = force_find (name))
		2576	force->destroy ();
		2577
		2578	object *force = get_archetype (FORCE_NAME);
		2579
		2580	force->slaying = name;
		2581	force->stats.food = 1;
		2582	force->speed_left = -1.f;
		2583
		2584	force->set_speed (duration ? 1.f / duration : 0.f);
		2585	force->flag [FLAG_IS_USED_UP] = true;
		2586	force->flag [FLAG_APPLIED] = true;
		2587
		2588	insert (force);
		2589	}
		2590
		2591	void
		2592	object::play_sound (faceidx sound)
		2593	{
		2594	if (!sound)
		2595	return;
		2596
		2597	if (flag [FLAG_REMOVED])
		2598	return;
		2599
		2600	if (env)
		2601	{
		2602	if (object *pl = in_player ())
		2603	pl->contr->play_sound (sound);
		2604	}
		2605	else
		2606	map->play_sound (sound, x, y);
		2607	}
		2608

Diff Legend

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