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.162 by root, Sat Jun 16 00:12:20 2007 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying
27	variable. */
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
33	#include <funcpoint.h>
34	#include <sproto.h>	29	#include <sproto.h>
35	#include <loader.h>	30	#include <loader.h>
36		31
37	#include <bitset>	32	#include <bitset>
38		33
39	int nrofallocobjects = 0;	34	UUID UUID::cur;
40	static UUID uuid;	35	static uint64_t seq_next_save;
41	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
42		37
43	objectvec objects;	38	objectvec objects;
44	activevec actives;	39	activevec actives;
45		40
46	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,
47	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
48	};	46	};
49	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,
50	-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
51	};	52	};
52	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,
53	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
54	};	58	};
55	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
56	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,
57	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
58	};	64	};
59		65
60	static void	66	static void
61	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
62	{	68	{
63	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
64		70	CALL_ARG_SV (newSVval64 (skip));
65	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
66	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
67		73	CALL_END;
68	FILE *fp;
69
70	if (!(fp = fopen (filename2, "w")))
71	{
72	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73	return;
74	}
75
76	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77	fclose (fp);
78	rename (filename2, filename1);
79	}	74	}
80		75
81	static void	76	static void
82	read_uuid (void)	77	read_uuid (void)
83	{	78	{
84	char filename[MAX_BUF];	79	char filename[MAX_BUF];
85		80
86	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
87		84
88	FILE *fp;	85	FILE *fp;
89		86
90	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
91	{	88	{
92	if (errno == ENOENT)	89	if (errno == ENOENT)
93	{	90	{
94	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
95	uuid.seq = 0;	92	UUID::cur.seq = 0;
96	write_uuid ();	93	write_uuid (UUID_GAP, true);
97	return;	94	return;
98	}	95	}
99		96
100	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101	_exit (1);	98	_exit (1);
102	}	99	}
103		100
104	int version;	101	UUID::BUF buf;
105	unsigned long long uid;	102	buf[0] = 0;
106	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
107	{	106	{
108	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109	_exit (1);	108	_exit (1);
110	}	109	}
111		110
112	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113	write_uuid ();	112
114	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
115	fclose (fp);	114	fclose (fp);
116	}	115	}
117		116
118	UUID	117	UUID
119	gen_uuid ()	118	UUID::gen ()
120	{	119	{
121	UUID uid;	120	UUID uid;
122		121
123	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
124		123
125	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
126	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
127		130
128	return uid;	131	return uid;
129	}	132	}
130		133
131	void	134	void
132	init_uuid ()	135	UUID::init ()
133	{	136	{
134	read_uuid ();	137	read_uuid ();
135	}	138	}
136		139
137	/* 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. */
138	static int	141	static bool
139	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
140	{	143	{
141	key_value *wants_field;
142
143	/* 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
144	* 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
145	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
146	*/	147	*/
147		148
148	/* For each field in wants, */	149	/* For each field in wants, */
149	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)
150	{	151	if (has->kv_get (kv->key) != kv->value)
151	key_value *has_field;	152	return false;
152
153	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);
155
156	if (has_field == NULL)
157	{
158	/* No field with that name. */
159	return FALSE;
160	}
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168
169	/* If we get here, we found a match. Now for the next field in wants. */
170	}
171		153
172	/* 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. */
173	return TRUE;	155	return true;
174	}	156	}
175		157
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	159	static bool
178	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
179	{	161	{
180	/* 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,
181	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
182	*/	164	*/
183	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);
184	}	167	}
185		168
186	/* 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
187	* they can be merged together.	170	* they can be merged together.
188	*	171	*
…		…
203	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
204	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
205	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
206	return 0;	189	return 0;
207		190
208	//TODO: this ain't working well, use nicer and correct overflow check	191	/* Do not merge objects if nrof would overflow. First part checks
209	/* 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
210	* 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
211	* used to store nrof).	194	* nrof values.
212	*/	195	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	197	return 0;
215		198
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* 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
218	* 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
219	* 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
220	* flags lose any meaning.	203	* flags lose any meaning.
221	*/	204	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		207
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		210
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->archname != ob2->arch->archname
229	|| ob1->arch != ob2->arch
230	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
231	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
232	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
233	|| ob1->weight != ob2->weight	215	|| ob1->weight != ob2->weight
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	|| ob1->attacktype != ob2->attacktype	216	|| ob1->attacktype != ob2->attacktype
237	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
238	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
239	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
240	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
241	|| ob1->animation_id != ob2->animation_id	221	|| ob1->animation_id != ob2->animation_id
		222	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
242	|| ob1->client_type != ob2->client_type	223	|| ob1->client_type != ob2->client_type
243	|| ob1->materialname != ob2->materialname	224	|| ob1->materialname != ob2->materialname
244	|| ob1->lore != ob2->lore	225	|| ob1->lore != ob2->lore
245	|| ob1->subtype != ob2->subtype	226	|| ob1->subtype != ob2->subtype
246	|| ob1->move_type != ob2->move_type	227	|| ob1->move_type != ob2->move_type
247	|| ob1->move_block != ob2->move_block	228	|| ob1->move_block != ob2->move_block
248	|| ob1->move_allow != ob2->move_allow	229	|| ob1->move_allow != ob2->move_allow
249	|| ob1->move_on != ob2->move_on	230	|| ob1->move_on != ob2->move_on
250	|| ob1->move_off != ob2->move_off	231	|| ob1->move_off != ob2->move_off
251	|| ob1->move_slow != ob2->move_slow	232	|| ob1->move_slow != ob2->move_slow
252	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	233	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	236	return 0;
254		237
		238	if ((ob1->flag ^ ob2->flag)
		239	.reset (FLAG_INV_LOCKED)
		240	.reset (FLAG_CLIENT_SENT)
		241	.reset (FLAG_REMOVED)
		242	.any ())
		243	return 0;
		244
255	/* This is really a spellbook check - really, we should	245	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	246	* not merge objects with real inventories, as splitting them
		247	* is hard.
257	*/	248	*/
258	if (ob1->inv || ob2->inv)	249	if (ob1->inv || ob2->inv)
259	{	250	{
260	/* if one object has inventory but the other doesn't, not equiv */	251	if (!(ob1->inv && ob2->inv))
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	252	return 0; /* inventories differ in length */
262	return 0;
263		253
264	/* Now check to see if the two inventory objects could merge */	254	if (ob1->inv->below || ob2->inv->below)
		255	return 0; /* more than one object in inv */
		256
265	if (!object::can_merge (ob1->inv, ob2->inv))	257	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	258	return 0; /* inventory objects differ */
267		259
268	/* inventory ok - still need to check rest of this object to see	260	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	261	* if it is valid.
270	*/	262	*/
271	}	263	}
…		…
290	if (ob1->level != ob2->level)	282	if (ob1->level != ob2->level)
291	return 0;	283	return 0;
292	break;	284	break;
293	}	285	}
294		286
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	287	if (ob1->key_values || ob2->key_values)
296	{	288	{
297	/* At least one of these has key_values. */	289	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	290	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	291	return 0; /* One has fields, but the other one doesn't. */
		292
		293	if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	294	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;
303	}	295	}
304		296
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self || ob2->self)	297	if (ob1->self || ob2->self)
307	{	298	{
308	ob1->optimise ();	299	ob1->optimise ();
309	ob2->optimise ();	300	ob2->optimise ();
310		301
311	if (ob1->self || ob2->self)	302	if (ob1->self || ob2->self)
		303	{
		304	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		305	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		306
		307	if (k1 != k2)
312	return 0;	308	return 0;
		309
		310	if (k1 == 0)
		311	return 1;
		312
		313	if (!cfperl_can_merge (ob1, ob2))
		314	return 0;
		315	}
313	}	316	}
314		317
315	/* Everything passes, must be OK. */	318	/* Everything passes, must be OK. */
316	return 1;	319	return 1;
317	}	320	}
318		321
		322	// find player who can see this object
		323	object *
		324	object::visible_to () const
		325	{
		326	if (client_visible () && !flag [FLAG_REMOVED])
		327	{
		328	// see if we are in a container of sorts
		329	if (env)
		330	{
		331	// the player inventory itself is always visible
		332	if (env->type == PLAYER)
		333	return env;
		334
		335	// else a player could have our env open
		336	object *envest = env->outer_env ();
		337
		338	// the player itself is always on a map, so we will find him here
		339	// even if our inv is in a player.
		340	if (envest->is_on_map ())
		341	if (object *pl = envest->ms ().player ())
		342	if (pl->container == env)
		343	return pl;
		344	}
		345	else
		346	{
		347	// maybe there is a player standing on the same mapspace
		348	// this will catch the case where "this" is a player
		349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		351	|| this == pl->container)
		352	return pl;
		353	}
		354	}
		355
		356	return 0;
		357	}
		358
		359	// adjust weight per container type ("of holding")
		360	static sint32
		361	weight_adjust_for (object *op, sint32 weight)
		362	{
		363	return op->type == CONTAINER
		364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		365	: weight;
		366	}
		367
319	/*	368	/*
		369	* adjust_weight(object, weight) adds the specified weight to an object,
		370	* and also updates how much the environment(s) is/are carrying.
		371	*/
		372	static void
		373	adjust_weight (object *op, sint32 weight)
		374	{
		375	while (op)
		376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
		381
		382	if (!weight)
		383	return;
		384
		385	op->carrying += weight;
		386
		387	if (object *pl = op->visible_to ())
		388	if (pl != op) // player is handled lazily
		389	esrv_update_item (UPD_WEIGHT, pl, op);
		390
		391	op = op->env;
		392	}
		393	}
		394
		395	/*
320	* sum_weight() is a recursive function which calculates the weight	396	* this is a recursive function which calculates the weight
321	* an object is carrying. It goes through in figures out how much	397	* an object is carrying. It goes through op and figures out how much
322	* containers are carrying, and sums it up.	398	* containers are carrying, and sums it up.
323	*/	399	*/
324	long	400	void
325	sum_weight (object *op)	401	object::update_weight ()
326	{	402	{
327	long sum;	403	sint32 sum = 0;
328	object *inv;
329		404
330	for (sum = 0, inv = op->inv; inv; inv = inv->below)	405	for (object *op = inv; op; op = op->below)
331	{	406	{
332	if (inv->inv)	407	if (op->inv)
333	sum_weight (inv);	408	op->update_weight ();
334		409
335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	410	sum += op->total_weight ();
		411	}
		412
		413	sum = weight_adjust_for (this, sum);
		414
		415	if (sum != carrying)
336	}	416	{
337
338	if (op->type == CONTAINER && op->stats.Str)
339	sum = (sum * (100 - op->stats.Str)) / 100;
340
341	if (op->carrying != sum)
342	op->carrying = sum;	417	carrying = sum;
343		418
344	return sum;	419	if (object *pl = visible_to ())
		420	if (pl != this) // player is handled lazily
		421	esrv_update_item (UPD_WEIGHT, pl, this);
		422	}
345	}	423	}
346		424
347	/**	425	/*
348	* Return the outermost environment object for a given object.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
349	*/
350
351	object *
352	object_get_env_recursive (object *op)
353	{
354	while (op->env != NULL)
355	op = op->env;
356	return op;
357	}
358
359	/*
360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361	* Some error messages.
362	* The result of the dump is stored in the static global errmsg array.
363	*/	427	*/
364	char *	428	char *
365	dump_object (object *op)	429	dump_object (object *op)
366	{	430	{
367	if (!op)	431	if (!op)
…		…
375	/*	439	/*
376	* get_nearest_part(multi-object, object 2) returns the part of the	440	* get_nearest_part(multi-object, object 2) returns the part of the
377	* multi-object 1 which is closest to the second object.	441	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	442	* If it's not a multi-object, it is returned.
379	*/	443	*/
380
381	object *	444	object *
382	get_nearest_part (object *op, const object *pl)	445	get_nearest_part (object *op, const object *pl)
383	{	446	{
384	object *tmp, *closest;	447	object *tmp, *closest;
385	int last_dist, i;	448	int last_dist, i;
386		449
387	if (op->more == NULL)	450	if (!op->more)
388	return op;	451	return op;
		452
389	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	453	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		454	tmp;
		455	tmp = tmp->more)
390	if ((i = distance (tmp, pl)) < last_dist)	456	if ((i = distance (tmp, pl)) < last_dist)
391	closest = tmp, last_dist = i;	457	closest = tmp, last_dist = i;
		458
392	return closest;	459	return closest;
393	}	460	}
394		461
395	/*	462	/*
396	* Returns the object which has the count-variable equal to the argument.	463	* Returns the object which has the count-variable equal to the argument.
		464	* VERRRY slow.
397	*/	465	*/
398	object *	466	object *
399	find_object (tag_t i)	467	find_object (tag_t i)
400	{	468	{
401	for_all_objects (op)	469	for_all_objects (op)
…		…
412	*/	480	*/
413	object *	481	object *
414	find_object_name (const char *str)	482	find_object_name (const char *str)
415	{	483	{
416	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
417	object *op;
418		485
		486	if (str_)
419	for_all_objects (op)	487	for_all_objects (op)
420	if (op->name == str_)	488	if (op->name == str_)
421	break;	489	return op;
422		490
423	return op;	491	return 0;
424	}
425
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}	492	}
431		493
432	/*	494	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	496	* skill and experience objects.
		497	* ACTUALLY NO! investigate! TODO
435	*/	498	*/
436	void	499	void
437	object::set_owner (object *owner)	500	object::set_owner (object *owner)
438	{	501	{
		502	// allow objects which own objects
439	if (!owner)	503	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	504	while (owner->owner)
450	owner = owner->owner;	505	owner = owner->owner;
		506
		507	if (flag [FLAG_FREED])
		508	{
		509	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		510	return;
		511	}
451		512
452	this->owner = owner;	513	this->owner = owner;
453	}	514	}
454		515
455	int	516	int
…		…
533	}	594	}
534		595
535	op->key_values = 0;	596	op->key_values = 0;
536	}	597	}
537		598
538	object &	599	/*
539	object::operator =(const object &src)	600	* copy_to first frees everything allocated by the dst object,
		601	* and then copies the contents of itself into the second
		602	* object, allocating what needs to be allocated. Basically, any
		603	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		604	* if the first object is freed, the pointers in the new object
		605	* will point at garbage.
		606	*/
		607	void
		608	object::copy_to (object *dst)
540	{	609	{
541	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
542	bool is_removed = flag [FLAG_REMOVED];
543
544	*(object_copy *)this = src;	611	*(object_copy *)dst = *this;
545
546	flag [FLAG_FREED] = is_freed;
547	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
548		613
549	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
550	if (src.key_values)	615	if (key_values)
551	{	616	{
552	key_value *tail = 0;	617	key_value *tail = 0;
553	key_values = 0;	618	dst->key_values = 0;
554		619
555	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
556	{	621	{
557	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
558		623
559	new_link->next = 0;	624	new_link->next = 0;
560	new_link->key = i->key;	625	new_link->key = i->key;
561	new_link->value = i->value;	626	new_link->value = i->value;
562		627
563	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
564	if (!key_values)	629	if (!dst->key_values)
565	{	630	{
566	key_values = new_link;	631	dst->key_values = new_link;
567	tail = new_link;	632	tail = new_link;
568	}	633	}
569	else	634	else
570	{	635	{
571	tail->next = new_link;	636	tail->next = new_link;
572	tail = new_link;	637	tail = new_link;
573	}	638	}
574	}	639	}
575	}	640	}
576	}
577
578	/*
579	* copy_to first frees everything allocated by the dst object,
580	* and then copies the contents of itself into the second
581	* object, allocating what needs to be allocated. Basically, any
582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
583	* if the first object is freed, the pointers in the new object
584	* will point at garbage.
585	*/
586	void
587	object::copy_to (object *dst)
588	{
589	*dst = *this;
590		641
591	if (speed < 0)	642	if (speed < 0)
592	dst->speed_left = speed_left - rndm ();	643	dst->speed_left -= rndm ();
593		644
594	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
595	}	646	}
596		647
597	void	648	void
598	object::instantiate ()	649	object::instantiate ()
599	{	650	{
600	if (!uuid.seq) // HACK	651	if (!uuid.seq) // HACK
601	uuid = gen_uuid ();	652	uuid = UUID::gen ();
602		653
603	speed_left = -0.1f;	654	speed_left = -0.1f;
604	/* copy the body_info to the body_used - this is only really	655	/* copy the body_info to the body_used - this is only really
605	* need for monsters, but doesn't hurt to do it for everything.	656	* need for monsters, but doesn't hurt to do it for everything.
606	* by doing so, when a monster is created, it has good starting	657	* by doing so, when a monster is created, it has good starting
…		…
616	object *	667	object *
617	object::clone ()	668	object::clone ()
618	{	669	{
619	object *neu = create ();	670	object *neu = create ();
620	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
621	return neu;	673	return neu;
622	}	674	}
623		675
624	/*	676	/*
625	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
676	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
677	*/	729	*/
678	void	730	void
679	update_object (object *op, int action)	731	update_object (object *op, int action)
680	{	732	{
681	if (op == NULL)	733	if (!op)
682	{	734	{
683	/* this should never happen */	735	/* this should never happen */
684	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
685	return;	737	return;
686	}	738	}
687		739
688	if (op->env)	740	if (!op->is_on_map ())
689	{	741	{
690	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
691	* to do in this case.	743	* to do in this case.
692	*/	744	*/
693	return;	745	return;
694	}	746	}
695
696	/* If the map is saving, don't do anything as everything is
697	* going to get freed anyways.
698	*/
699	if (!op->map || op->map->in_memory == MAP_SAVING)
700	return;
701		747
702	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
703	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	749	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
704	{	750	{
705	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
765	static int object_count;	811	static int object_count;
766		812
767	void object::link ()	813	void object::link ()
768	{	814	{
769	assert (!index);//D	815	assert (!index);//D
770	uuid = gen_uuid ();	816	uuid = UUID::gen ();
771	count = ++object_count;	817	count = ++object_count;
772		818
773	refcnt_inc ();	819	refcnt_inc ();
774	objects.insert (this);	820	objects.insert (this);
775	}	821	}
…		…
848	object::destroy_inv (bool drop_to_ground)	894	object::destroy_inv (bool drop_to_ground)
849	{	895	{
850	// need to check first, because the checks below might segfault	896	// need to check first, because the checks below might segfault
851	// as we might be on an invalid mapspace and crossfire code	897	// as we might be on an invalid mapspace and crossfire code
852	// is too buggy to ensure that the inventory is empty.	898	// is too buggy to ensure that the inventory is empty.
853	// corollary: if you create arrows etc. with stuff in tis inventory,	899	// corollary: if you create arrows etc. with stuff in its inventory,
854	// cf will crash below with off-map x and y	900	// cf will crash below with off-map x and y
855	if (!inv)	901	if (!inv)
856	return;	902	return;
857		903
858	/* Only if the space blocks everything do we not process -	904	/* Only if the space blocks everything do we not process -
859	* if some form of movement is allowed, let objects	905	* if some form of movement is allowed, let objects
860	* drop on that space.	906	* drop on that space.
861	*/	907	*/
862	if (!drop_to_ground	908	if (!drop_to_ground
863	|| !map	909	|| !map
864	|| map->in_memory != MAP_IN_MEMORY	910	|| map->in_memory != MAP_ACTIVE
865	|| map->nodrop	911	|| map->no_drop
866	|| ms ().move_block == MOVE_ALL)	912	|| ms ().move_block == MOVE_ALL)
867	{	913	{
868	while (inv)	914	while (inv)
869	{
870	inv->destroy_inv (drop_to_ground);
871	inv->destroy ();	915	inv->destroy (true);
872	}
873	}	916	}
874	else	917	else
875	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
876	while (inv)	919	while (inv)
877	{	920	{
…		…
881	|| op->flag [FLAG_NO_DROP]	924	|| op->flag [FLAG_NO_DROP]
882	|| op->type == RUNE	925	|| op->type == RUNE
883	|| op->type == TRAP	926	|| op->type == TRAP
884	|| op->flag [FLAG_IS_A_TEMPLATE]	927	|| op->flag [FLAG_IS_A_TEMPLATE]
885	|| op->flag [FLAG_DESTROY_ON_DEATH])	928	|| op->flag [FLAG_DESTROY_ON_DEATH])
886	op->destroy ();	929	op->destroy (true);
887	else	930	else
888	map->insert (op, x, y);	931	map->insert (op, x, y);
889	}	932	}
890	}	933	}
891	}	934	}
…		…
895	object *op = new object;	938	object *op = new object;
896	op->link ();	939	op->link ();
897	return op;	940	return op;
898	}	941	}
899		942
		943	static struct freed_map : maptile
		944	{
		945	freed_map ()
		946	{
		947	path = "<freed objects map>";
		948	name = "/internal/freed_objects_map";
		949	width = 3;
		950	height = 3;
		951	no_drop = 1;
		952	no_reset = 1;
		953
		954	alloc ();
		955	in_memory = MAP_ACTIVE;
		956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
		961	}
		962	} freed_map; // freed objects are moved here to avoid crashes
		963
900	void	964	void
901	object::do_destroy ()	965	object::do_destroy ()
902	{	966	{
903	attachable::do_destroy ();
904
905	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
906	remove_button_link (this);	968	remove_button_link (this);
907		969
908	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
909	remove_friendly_object (this);	971	remove_friendly_object (this);
910		972
911	if (!flag [FLAG_REMOVED])
912	remove ();	973	remove ();
913		974
914	destroy_inv (true);	975	attachable::do_destroy ();
915		976
916	deactivate ();	977	deactivate ();
917	unlink ();	978	unlink ();
918		979
919	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
920		981
921	// hack to ensure that freed objects still have a valid map	982	// hack to ensure that freed objects still have a valid map
922	{
923	static maptile *freed_map; // freed objects are moved here to avoid crashes
924
925	if (!freed_map)
926	{
927	freed_map = new maptile;
928
929	freed_map->name = "/internal/freed_objects_map";
930	freed_map->width = 3;
931	freed_map->height = 3;
932
933	freed_map->alloc ();
934	freed_map->in_memory = MAP_IN_MEMORY;
935	}
936
937	map = freed_map;	983	map = &freed_map;
938	x = 1;	984	x = 1;
939	y = 1;	985	y = 1;
940	}
941		986
942	if (more)	987	if (more)
943	{	988	{
944	more->destroy ();	989	more->destroy ();
945	more = 0;	990	more = 0;
…		…
958	object::destroy (bool destroy_inventory)	1003	object::destroy (bool destroy_inventory)
959	{	1004	{
960	if (destroyed ())	1005	if (destroyed ())
961	return;	1006	return;
962		1007
		1008	if (!is_head () && !head->destroyed ())
		1009	{
		1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1011	head->destroy (destroy_inventory);
		1012	return;
		1013	}
		1014
963	if (destroy_inventory)	1015	destroy_inv (!destroy_inventory);
964	destroy_inv (false);	1016
		1017	if (is_head ())
		1018	if (sound_destroy)
		1019	play_sound (sound_destroy);
		1020	else if (flag [FLAG_MONSTER])
		1021	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
965		1022
966	attachable::destroy ();	1023	attachable::destroy ();
967	}
968
969	/*
970	* sub_weight() recursively (outwards) subtracts a number from the
971	* weight of an object (and what is carried by it's environment(s)).
972	*/
973	void
974	sub_weight (object *op, signed long weight)
975	{
976	while (op != NULL)
977	{
978	if (op->type == CONTAINER)
979	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
980
981	op->carrying -= weight;
982	op = op->env;
983	}
984	}	1024	}
985		1025
986	/* op->remove ():	1026	/* op->remove ():
987	* This function removes the object op from the linked list of objects	1027	* This function removes the object op from the linked list of objects
988	* which it is currently tied to. When this function is done, the	1028	* which it is currently tied to. When this function is done, the
…		…
994	object::do_remove ()	1034	object::do_remove ()
995	{	1035	{
996	object *tmp, *last = 0;	1036	object *tmp, *last = 0;
997	object *otmp;	1037	object *otmp;
998		1038
999	if (QUERY_FLAG (this, FLAG_REMOVED))	1039	if (flag [FLAG_REMOVED])
1000	return;	1040	return;
1001		1041
1002	SET_FLAG (this, FLAG_REMOVED);
1003	INVOKE_OBJECT (REMOVE, this);	1042	INVOKE_OBJECT (REMOVE, this);
		1043
		1044	flag [FLAG_REMOVED] = true;
1004		1045
1005	if (more)	1046	if (more)
1006	more->remove ();	1047	more->remove ();
1007		1048
1008	/*	1049	/*
1009	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1010	* inventory.	1051	* inventory.
1011	*/	1052	*/
1012	if (env)	1053	if (env)
1013	{	1054	{
1014	if (nrof)	1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1015	sub_weight (env, weight * nrof);	1056	if (object *pl = visible_to ())
1016	else	1057	esrv_del_item (pl->contr, count);
1017	sub_weight (env, weight + carrying);	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1059
		1060	adjust_weight (env, -total_weight ());
		1061
		1062	/* we set up values so that it could be inserted into
		1063	* the map, but we don't actually do that - it is up
		1064	* to the caller to decide what we want to do.
		1065	*/
		1066	map = env->map;
		1067	x = env->x;
		1068	y = env->y;
		1069
		1070	// make sure cmov optimisation is applicable
		1071	*(above ? &above->below : &env->inv) = below;
		1072	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1073
		1074	above = 0;
		1075	below = 0;
		1076	env = 0;
1018		1077
1019	/* NO_FIX_PLAYER is set when a great many changes are being	1078	/* NO_FIX_PLAYER is set when a great many changes are being
1020	* made to players inventory. If set, avoiding the call	1079	* made to players inventory. If set, avoiding the call
1021	* to save cpu time.	1080	* to save cpu time.
1022	*/	1081	*/
1023	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1024	otmp->update_stats ();	1083	otmp->update_stats ();
1025
1026	if (above)
1027	above->below = below;
1028	else
1029	env->inv = below;
1030
1031	if (below)
1032	below->above = above;
1033
1034	/* we set up values so that it could be inserted into
1035	* the map, but we don't actually do that - it is up
1036	* to the caller to decide what we want to do.
1037	*/
1038	x = env->x, y = env->y;
1039	map = env->map;
1040	above = 0, below = 0;
1041	env = 0;
1042	}	1084	}
1043	else if (map)	1085	else if (map)
1044	{	1086	{
1045	if (type == PLAYER)
1046	{
1047	// leaving a spot always closes any open container on the ground
1048	if (container && !container->env)
1049	// this causes spurious floorbox updates, but it ensures
1050	// that the CLOSE event is being sent.
1051	close_container ();
1052
1053	--map->players;
1054	map->touch ();
1055	}
1056
1057	map->dirty = true;	1087	map->dirty = true;
1058	mapspace &ms = this->ms ();	1088	mapspace &ms = this->ms ();
1059		1089
		1090	if (object *pl = ms.player ())
		1091	{
		1092	if (type == PLAYER) // this == pl(!)
		1093	{
		1094	// leaving a spot always closes any open container on the ground
		1095	if (container && !container->env)
		1096	// this causes spurious floorbox updates, but it ensures
		1097	// that the CLOSE event is being sent.
		1098	close_container ();
		1099
		1100	--map->players;
		1101	map->touch ();
		1102	}
		1103	else if (pl->container == this)
		1104	{
		1105	// removing a container should close it
		1106	close_container ();
		1107	}
		1108
		1109	esrv_del_item (pl->contr, count);
		1110	}
		1111
1060	/* link the object above us */	1112	/* link the object above us */
1061	if (above)	1113	// re-link, make sure compiler can easily use cmove
1062	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
1063	else	1115	*(below ? &below->above : &ms.bot) = above;
1064	ms.top = below; /* we were top, set new top */
1065
1066	/* Relink the object below us, if there is one */
1067	if (below)
1068	below->above = above;
1069	else
1070	{
1071	/* Nothing below, which means we need to relink map object for this space
1072	* use translated coordinates in case some oddness with map tiling is
1073	* evident
1074	*/
1075	if (GET_MAP_OB (map, x, y) != this)
1076	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 ());
1077
1078	ms.bot = above; /* goes on above it. */
1079	}
1080		1116
1081	above = 0;	1117	above = 0;
1082	below = 0;	1118	below = 0;
1083		1119
1084	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
1085	return;	1121	return;
1086		1122
1087	int check_walk_off = !flag [FLAG_NO_APPLY];	1123	int check_walk_off = !flag [FLAG_NO_APPLY];
		1124
		1125	if (object *pl = ms.player ())
		1126	{
		1127	if (pl->container == this)
		1128	/* If a container that the player is currently using somehow gets
		1129	* removed (most likely destroyed), update the player view
		1130	* appropriately.
		1131	*/
		1132	pl->close_container ();
		1133
		1134	//TODO: the floorbox prev/next might need updating
		1135	//esrv_del_item (pl->contr, count);
		1136	//TODO: update floorbox to preserve ordering
		1137	if (pl->contr->ns)
		1138	pl->contr->ns->floorbox_update ();
		1139	}
1088		1140
1089	for (tmp = ms.bot; tmp; tmp = tmp->above)	1141	for (tmp = ms.bot; tmp; tmp = tmp->above)
1090	{	1142	{
1091	/* No point updating the players look faces if he is the object	1143	/* No point updating the players look faces if he is the object
1092	* being removed.	1144	* being removed.
1093	*/	1145	*/
1094
1095	if (tmp->type == PLAYER && tmp != this)
1096	{
1097	/* If a container that the player is currently using somehow gets
1098	* removed (most likely destroyed), update the player view
1099	* appropriately.
1100	*/
1101	if (tmp->container == this)
1102	{
1103	flag [FLAG_APPLIED] = 0;
1104	tmp->container = 0;
1105	}
1106
1107	if (tmp->contr->ns)
1108	tmp->contr->ns->floorbox_update ();
1109	}
1110		1146
1111	/* See if object moving off should effect something */	1147	/* See if object moving off should effect something */
1112	if (check_walk_off	1148	if (check_walk_off
1113	&& ((move_type & tmp->move_off)	1149	&& ((move_type & tmp->move_off)
1114	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1146	merge_ob (object *op, object *top)	1182	merge_ob (object *op, object *top)
1147	{	1183	{
1148	if (!op->nrof)	1184	if (!op->nrof)
1149	return 0;	1185	return 0;
1150		1186
1151	if (top)	1187	if (!top)
1152	for (top = op; top && top->above; top = top->above)	1188	for (top = op; top && top->above; top = top->above)
1153	;	1189	;
1154		1190
1155	for (; top; top = top->below)	1191	for (; top; top = top->below)
1156	{
1157	if (top == op)
1158	continue;
1159
1160	if (object::can_merge (op, top))	1192	if (object::can_merge (op, top))
1161	{	1193	{
1162	top->nrof += op->nrof;	1194	top->nrof += op->nrof;
1163		1195
1164	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1196	if (object *pl = top->visible_to ())
1165	op->weight = 0; /* Don't want any adjustements now */	1197	esrv_update_item (UPD_NROF, pl, top);
		1198
		1199	op->weight = 0; // cancel the addition above
		1200	op->carrying = 0; // must be 0 already
		1201
1166	op->destroy ();	1202	op->destroy (1);
		1203
1167	return top;	1204	return top;
1168	}	1205	}
1169	}
1170		1206
1171	return 0;	1207	return 0;
1172	}	1208	}
1173		1209
1174	void	1210	void
…		…
1199	* job preparing multi-part monsters.	1235	* job preparing multi-part monsters.
1200	*/	1236	*/
1201	object *	1237	object *
1202	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1238	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1203	{	1239	{
		1240	op->remove ();
		1241
1204	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1242	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1205	{	1243	{
1206	tmp->x = x + tmp->arch->x;	1244	tmp->x = x + tmp->arch->x;
1207	tmp->y = y + tmp->arch->y;	1245	tmp->y = y + tmp->arch->y;
1208	}	1246	}
…		…
1231	* just 'op' otherwise	1269	* just 'op' otherwise
1232	*/	1270	*/
1233	object *	1271	object *
1234	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1272	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1235	{	1273	{
1236	assert (!op->flag [FLAG_FREED]);	1274	if (op->is_on_map ())
1237
1238	object *top, *floor = NULL;
1239
1240	op->remove ();
1241
1242	#if 0
1243	if (!m->active != !op->active)
1244	if (m->active)
1245	op->activate_recursive ();
1246	else
1247	op->deactivate_recursive ();
1248	#endif
1249
1250	if (out_of_map (m, op->x, op->y))
1251	{	1275	{
1252	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());	1276	LOG (llevError, "insert_ob_in_map called for object already on map");
1253	#ifdef MANY_CORES
1254	/* Better to catch this here, as otherwise the next use of this object
1255	* is likely to cause a crash. Better to find out where it is getting
1256	* improperly inserted.
1257	*/
1258	abort ();	1277	abort ();
1259	#endif	1278	}
1260	return op;	1279
		1280	if (op->env)
1261	}	1281	{
		1282	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
		1283	op->remove ();
		1284	}
1262		1285
1263	if (object *more = op->more)	1286	if (op->face && !face_info (op->face))//D TODO: remove soon
1264	if (!insert_ob_in_map (more, m, originator, flag))	1287	{//D
1265	return 0;	1288	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1266		1289	op->face = 1;//D
1267	CLEAR_FLAG (op, FLAG_REMOVED);	1290	}//D
1268		1291
1269	/* Ideally, the caller figures this out. However, it complicates a lot	1292	/* Ideally, the caller figures this out. However, it complicates a lot
1270	* of areas of callers (eg, anything that uses find_free_spot would now	1293	* of areas of callers (eg, anything that uses find_free_spot would now
1271	* need extra work	1294	* need extra work
1272	*/	1295	*/
1273	if (!xy_normalise (m, op->x, op->y))	1296	if (!xy_normalise (m, op->x, op->y))
		1297	{
		1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1274	return 0;	1299	return 0;
		1300	}
		1301
		1302	if (object *more = op->more)
		1303	if (!insert_ob_in_map (more, m, originator, flag))
		1304	return 0;
		1305
		1306	CLEAR_FLAG (op, FLAG_REMOVED);
1275		1307
1276	op->map = m;	1308	op->map = m;
1277	mapspace &ms = op->ms ();	1309	mapspace &ms = op->ms ();
1278		1310
1279	/* this has to be done after we translate the coordinates.	1311	/* this has to be done after we translate the coordinates.
1280	*/	1312	*/
1281	if (op->nrof && !(flag & INS_NO_MERGE))	1313	if (op->nrof && !(flag & INS_NO_MERGE))
1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1314	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1283	if (object::can_merge (op, tmp))	1315	if (object::can_merge (op, tmp))
1284	{	1316	{
		1317	// TODO: we actually want to update tmp, not op,
		1318	// but some caller surely breaks when we return tmp
		1319	// from here :/
1285	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1286	tmp->destroy ();	1321	tmp->destroy (1);
1287	}	1322	}
1288		1323
1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1290	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1291		1326
…		…
1298	{	1333	{
1299	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1300	abort ();	1335	abort ();
1301	}	1336	}
1302		1337
		1338	if (!originator->is_on_map ())
		1339	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1340	op->debug_desc (), originator->debug_desc ());
		1341
1303	op->above = originator;	1342	op->above = originator;
1304	op->below = originator->below;	1343	op->below = originator->below;
1305
1306	if (op->below)
1307	op->below->above = op;
1308	else
1309	ms.bot = op;
1310
1311	/* since *below* originator, no need to update top */
1312	originator->below = op;	1344	originator->below = op;
		1345
		1346	*(op->below ? &op->below->above : &ms.bot) = op;
1313	}	1347	}
1314	else	1348	else
1315	{	1349	{
1316	top = ms.bot;	1350	object *floor = 0;
		1351	object *top = ms.top;
1317		1352
1318	/* If there are other objects, then */	1353	/* If there are other objects, then */
1319	if ((!(flag & INS_MAP_LOAD)) && top)	1354	if (top)
1320	{	1355	{
1321	object *last = 0;
1322
1323	/*	1356	/*
1324	* If there are multiple objects on this space, we do some trickier handling.	1357	* If there are multiple objects on this space, we do some trickier handling.
1325	* We've already dealt with merging if appropriate.	1358	* We've already dealt with merging if appropriate.
1326	* Generally, we want to put the new object on top. But if	1359	* Generally, we want to put the new object on top. But if
1327	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1360	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1330	* once we get to them. This reduces the need to traverse over all of	1363	* once we get to them. This reduces the need to traverse over all of
1331	* them when adding another one - this saves quite a bit of cpu time	1364	* them when adding another one - this saves quite a bit of cpu time
1332	* when lots of spells are cast in one area. Currently, it is presumed	1365	* when lots of spells are cast in one area. Currently, it is presumed
1333	* that flying non pickable objects are spell objects.	1366	* that flying non pickable objects are spell objects.
1334	*/	1367	*/
1335	for (top = ms.bot; top; top = top->above)	1368	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1336	{	1369	{
1337	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1370	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1338	floor = top;	1371	floor = tmp;
1339		1372
1340	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1373	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1341	{	1374	{
1342	/* We insert above top, so we want this object below this */	1375	/* We insert above top, so we want this object below this */
1343	top = top->below;	1376	top = tmp->below;
1344	break;	1377	break;
1345	}	1378	}
1346		1379
1347	last = top;	1380	top = tmp;
1348	}	1381	}
1349
1350	/* Don't want top to be NULL, so set it to the last valid object */
1351	top = last;
1352		1382
1353	/* We let update_position deal with figuring out what the space	1383	/* We let update_position deal with figuring out what the space
1354	* looks like instead of lots of conditions here.	1384	* looks like instead of lots of conditions here.
1355	* makes things faster, and effectively the same result.	1385	* makes things faster, and effectively the same result.
1356	*/	1386	*/
…		…
1363	*/	1393	*/
1364	if (!(flag & INS_ON_TOP)	1394	if (!(flag & INS_ON_TOP)
1365	&& ms.flags () & P_BLOCKSVIEW	1395	&& ms.flags () & P_BLOCKSVIEW
1366	&& (op->face && !faces [op->face].visibility))	1396	&& (op->face && !faces [op->face].visibility))
1367	{	1397	{
		1398	object *last;
		1399
1368	for (last = top; last != floor; last = last->below)	1400	for (last = top; last != floor; last = last->below)
1369	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1401	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1370	break;	1402	break;
1371		1403
1372	/* Check to see if we found the object that blocks view,	1404	/* Check to see if we found the object that blocks view,
…		…
1377	if (last && last->below && last != floor)	1409	if (last && last->below && last != floor)
1378	top = last->below;	1410	top = last->below;
1379	}	1411	}
1380	} /* If objects on this space */	1412	} /* If objects on this space */
1381		1413
1382	if (flag & INS_MAP_LOAD)
1383	top = ms.top;
1384
1385	if (flag & INS_ABOVE_FLOOR_ONLY)	1414	if (flag & INS_ABOVE_FLOOR_ONLY)
1386	top = floor;	1415	top = floor;
1387		1416
1388	/* Top is the object that our object (op) is going to get inserted above.	1417	// insert object above top, or bottom-most if top = 0
1389	*/
1390
1391	/* First object on this space */
1392	if (!top)	1418	if (!top)
1393	{	1419	{
		1420	op->below = 0;
1394	op->above = ms.bot;	1421	op->above = ms.bot;
1395
1396	if (op->above)
1397	op->above->below = op;
1398
1399	op->below = 0;
1400	ms.bot = op;	1422	ms.bot = op;
		1423
		1424	*(op->above ? &op->above->below : &ms.top) = op;
1401	}	1425	}
1402	else	1426	else
1403	{ /* get inserted into the stack above top */	1427	{
1404	op->above = top->above;	1428	op->above = top->above;
1405
1406	if (op->above)
1407	op->above->below = op;	1429	top->above = op;
1408		1430
1409	op->below = top;	1431	op->below = top;
1410	top->above = op;	1432	*(op->above ? &op->above->below : &ms.top) = op;
1411	}	1433	}
1412		1434	}
1413	if (!op->above)
1414	ms.top = op;
1415	} /* else not INS_BELOW_ORIGINATOR */
1416		1435
1417	if (op->type == PLAYER)	1436	if (op->type == PLAYER)
1418	{	1437	{
1419	op->contr->do_los = 1;	1438	op->contr->do_los = 1;
1420	++op->map->players;	1439	++op->map->players;
1421	op->map->touch ();	1440	op->map->touch ();
1422	}	1441	}
1423		1442
1424	op->map->dirty = true;	1443	op->map->dirty = true;
1425		1444
1426	/* If we have a floor, we know the player, if any, will be above
1427	* it, so save a few ticks and start from there.
1428	*/
1429	if (!(flag & INS_MAP_LOAD))
1430	if (object *pl = ms.player ())	1445	if (object *pl = ms.player ())
		1446	//TODO: the floorbox prev/next might need updating
		1447	//esrv_send_item (pl, op);
		1448	//TODO: update floorbox to preserve ordering
1431	if (pl->contr->ns)	1449	if (pl->contr->ns)
1432	pl->contr->ns->floorbox_update ();	1450	pl->contr->ns->floorbox_update ();
1433		1451
1434	/* If this object glows, it may affect lighting conditions that are	1452	/* If this object glows, it may affect lighting conditions that are
1435	* visible to others on this map. But update_all_los is really	1453	* visible to others on this map. But update_all_los is really
1436	* an inefficient way to do this, as it means los for all players	1454	* an inefficient way to do this, as it means los for all players
1437	* on the map will get recalculated. The players could very well	1455	* on the map will get recalculated. The players could very well
…		…
1479	* op is the object to insert it under: supplies x and the map.	1497	* op is the object to insert it under: supplies x and the map.
1480	*/	1498	*/
1481	void	1499	void
1482	replace_insert_ob_in_map (const char *arch_string, object *op)	1500	replace_insert_ob_in_map (const char *arch_string, object *op)
1483	{	1501	{
1484	object *tmp, *tmp1;
1485
1486	/* first search for itself and remove any old instances */	1502	/* first search for itself and remove any old instances */
1487		1503
1488	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1504	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1489	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1505	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1490	tmp->destroy ();	1506	tmp->destroy (1);
1491		1507
1492	tmp1 = arch_to_object (archetype::find (arch_string));	1508	object *tmp = arch_to_object (archetype::find (arch_string));
1493		1509
1494	tmp1->x = op->x;	1510	tmp->x = op->x;
1495	tmp1->y = op->y;	1511	tmp->y = op->y;
		1512
1496	insert_ob_in_map (tmp1, op->map, op, 0);	1513	insert_ob_in_map (tmp, op->map, op, 0);
1497	}	1514	}
1498		1515
1499	object *	1516	object *
1500	object::insert_at (object *where, object *originator, int flags)	1517	object::insert_at (object *where, object *originator, int flags)
1501	{	1518	{
		1519	if (where->env)
		1520	return where->env->insert (this);
		1521	else
1502	return where->map->insert (this, where->x, where->y, originator, flags);	1522	return where->map->insert (this, where->x, where->y, originator, flags);
1503	}	1523	}
1504		1524
1505	/*	1525	/*
1506	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1507	* is returned contains nr objects, and the remaining parts contains
1508	* the rest (or is removed and freed if that number is 0).
1509	* On failure, NULL is returned, and the reason put into the
1510	* global static errmsg array.
1511	*/
1512	object *
1513	get_split_ob (object *orig_ob, uint32 nr)
1514	{
1515	object *newob;
1516	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1517
1518	if (orig_ob->nrof < nr)
1519	{
1520	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1521	return NULL;
1522	}
1523
1524	newob = object_create_clone (orig_ob);
1525
1526	if ((orig_ob->nrof -= nr) < 1)
1527	orig_ob->destroy (1);
1528	else if (!is_removed)
1529	{
1530	if (orig_ob->env != NULL)
1531	sub_weight (orig_ob->env, orig_ob->weight * nr);
1532	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1533	{
1534	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1535	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1536	return NULL;
1537	}
1538	}
1539
1540	newob->nrof = nr;
1541
1542	return newob;
1543	}
1544
1545	/*
1546	* decrease_ob_nr(object, number) decreases a specified number from	1526	* decrease(object, number) decreases a specified number from
1547	* the amount of an object. If the amount reaches 0, the object	1527	* the amount of an object. If the amount reaches 0, the object
1548	* is subsequently removed and freed.	1528	* is subsequently removed and freed.
1549	*	1529	*
1550	* Return value: 'op' if something is left, NULL if the amount reached 0	1530	* Return value: 'op' if something is left, NULL if the amount reached 0
1551	*/	1531	*/
		1532	bool
		1533	object::decrease (sint32 nr)
		1534	{
		1535	if (!nr)
		1536	return true;
		1537
		1538	nr = min (nr, nrof);
		1539
		1540	nrof -= nr;
		1541
		1542	if (nrof)
		1543	{
		1544	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1545
		1546	if (object *pl = visible_to ())
		1547	esrv_update_item (UPD_NROF, pl, this);
		1548
		1549	return true;
		1550	}
		1551	else
		1552	{
		1553	destroy ();
		1554	return false;
		1555	}
		1556	}
		1557
		1558	/*
		1559	* split(ob,nr) splits up ob into two parts. The part which
		1560	* is returned contains nr objects, and the remaining parts contains
		1561	* the rest (or is removed and returned if that number is 0).
		1562	* On failure, NULL is returned.
		1563	*/
1552	object *	1564	object *
1553	decrease_ob_nr (object *op, uint32 i)	1565	object::split (sint32 nr)
1554	{	1566	{
1555	object *tmp;	1567	int have = number_of ();
1556		1568
1557	if (i == 0) /* objects with op->nrof require this check */	1569	if (have < nr)
1558	return op;	1570	return 0;
1559		1571	else if (have == nr)
1560	if (i > op->nrof)
1561	i = op->nrof;
1562
1563	if (QUERY_FLAG (op, FLAG_REMOVED))
1564	op->nrof -= i;
1565	else if (op->env)
1566	{	1572	{
1567	/* is this object in the players inventory, or sub container
1568	* therein?
1569	*/
1570	tmp = op->in_player ();
1571	/* nope. Is this a container the player has opened?
1572	* If so, set tmp to that player.
1573	* IMO, searching through all the players will mostly
1574	* likely be quicker than following op->env to the map,
1575	* and then searching the map for a player.
1576	*/
1577	if (!tmp)
1578	for_all_players (pl)
1579	if (pl->ob->container == op->env)
1580	{
1581	tmp = pl->ob;
1582	break;
1583	}
1584
1585	if (i < op->nrof)
1586	{
1587	sub_weight (op->env, op->weight * i);
1588	op->nrof -= i;
1589	if (tmp)
1590	esrv_send_item (tmp, op);
1591	}
1592	else
1593	{
1594	op->remove ();	1573	remove ();
1595	op->nrof = 0;	1574	return this;
1596	if (tmp)
1597	esrv_del_item (tmp->contr, op->count);
1598	}
1599	}	1575	}
1600	else	1576	else
1601	{	1577	{
1602	object *above = op->above;	1578	decrease (nr);
1603		1579
1604	if (i < op->nrof)	1580	object *op = deep_clone ();
1605	op->nrof -= i;	1581	op->nrof = nr;
1606	else
1607	{
1608	op->remove ();
1609	op->nrof = 0;
1610	}
1611
1612	/* Since we just removed op, op->above is null */
1613	for (tmp = above; tmp; tmp = tmp->above)
1614	if (tmp->type == PLAYER)
1615	{
1616	if (op->nrof)
1617	esrv_send_item (tmp, op);
1618	else
1619	esrv_del_item (tmp->contr, op->count);
1620	}
1621	}
1622
1623	if (op->nrof)
1624	return op;	1582	return op;
1625	else
1626	{
1627	op->destroy ();
1628	return 0;
1629	}
1630	}
1631
1632	/*
1633	* add_weight(object, weight) adds the specified weight to an object,
1634	* and also updates how much the environment(s) is/are carrying.
1635	*/
1636	void
1637	add_weight (object *op, signed long weight)
1638	{
1639	while (op != NULL)
1640	{
1641	if (op->type == CONTAINER)
1642	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1643
1644	op->carrying += weight;
1645	op = op->env;
1646	}	1583	}
1647	}	1584	}
1648		1585
1649	object *	1586	object *
1650	insert_ob_in_ob (object *op, object *where)	1587	insert_ob_in_ob (object *op, object *where)
…		…
1675	* be != op, if items are merged. -Tero	1612	* be != op, if items are merged. -Tero
1676	*/	1613	*/
1677	object *	1614	object *
1678	object::insert (object *op)	1615	object::insert (object *op)
1679	{	1616	{
1680	object *tmp, *otmp;
1681
1682	if (!QUERY_FLAG (op, FLAG_REMOVED))
1683	op->remove ();
1684
1685	if (op->more)	1617	if (op->more)
1686	{	1618	{
1687	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1619	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1688	return op;	1620	return op;
1689	}	1621	}
1690		1622
1691	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1623	op->remove ();
1692	CLEAR_FLAG (op, FLAG_REMOVED);	1624
		1625	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1626
1693	if (op->nrof)	1627	if (op->nrof)
1694	{
1695	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1628	for (object *tmp = inv; tmp; tmp = tmp->below)
1696	if (object::can_merge (tmp, op))	1629	if (object::can_merge (tmp, op))
1697	{	1630	{
1698	/* return the original object and remove inserted object	1631	/* return the original object and remove inserted object
1699	(client needs the original object) */	1632	(client needs the original object) */
1700	tmp->nrof += op->nrof;	1633	tmp->nrof += op->nrof;
1701	/* Weight handling gets pretty funky. Since we are adding to	1634
1702	* tmp->nrof, we need to increase the weight.	1635	if (object *pl = tmp->visible_to ())
1703	*/	1636	esrv_update_item (UPD_NROF, pl, tmp);
		1637
1704	add_weight (this, op->weight * op->nrof);	1638	adjust_weight (this, op->total_weight ());
1705	SET_FLAG (op, FLAG_REMOVED);	1639
1706	op->destroy (); /* free the inserted object */	1640	op->destroy (1);
1707	op = tmp;	1641	op = tmp;
1708	op->remove (); /* and fix old object's links */	1642	goto inserted;
1709	CLEAR_FLAG (op, FLAG_REMOVED);
1710	break;
1711	}	1643	}
1712		1644
1713	/* I assume combined objects have no inventory	1645	op->owner = 0; // it's his/hers now. period.
1714	* We add the weight - this object could have just been removed
1715	* (if it was possible to merge). calling remove_ob will subtract
1716	* the weight, so we need to add it in again, since we actually do
1717	* the linking below
1718	*/
1719	add_weight (this, op->weight * op->nrof);
1720	}
1721	else
1722	add_weight (this, (op->weight + op->carrying));
1723
1724	otmp = this->in_player ();
1725	if (otmp && otmp->contr)
1726	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1727	otmp->update_stats ();
1728
1729	op->map = 0;	1646	op->map = 0;
1730	op->env = this;	1647	op->x = 0;
		1648	op->y = 0;
		1649
1731	op->above = 0;	1650	op->above = 0;
1732	op->below = 0;	1651	op->below = inv;
1733	op->x = 0, op->y = 0;	1652	op->env = this;
1734		1653
		1654	if (inv)
		1655	inv->above = op;
		1656
		1657	inv = op;
		1658
		1659	op->flag [FLAG_REMOVED] = 0;
		1660
		1661	if (object *pl = op->visible_to ())
		1662	esrv_send_item (pl, op);
		1663
		1664	adjust_weight (this, op->total_weight ());
		1665
		1666	inserted:
1735	/* reset the light list and los of the players on the map */	1667	/* reset the light list and los of the players on the map */
1736	if ((op->glow_radius != 0) && map)	1668	if (op->glow_radius && map && map->darkness)
1737	{
1738	#ifdef DEBUG_LIGHTS
1739	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1740	#endif /* DEBUG_LIGHTS */
1741	if (map->darkness)
1742	update_all_los (map, x, y);	1669	update_all_los (map, x, y);
1743	}
1744		1670
1745	/* Client has no idea of ordering so lets not bother ordering it here.	1671	// if this is a player's inventory, update stats
1746	* It sure simplifies this function...	1672	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1747	*/	1673	update_stats ();
1748	if (!inv)
1749	inv = op;
1750	else
1751	{
1752	op->below = inv;
1753	op->below->above = op;
1754	inv = op;
1755	}
1756		1674
1757	INVOKE_OBJECT (INSERT, this);	1675	INVOKE_OBJECT (INSERT, this);
1758		1676
1759	return op;	1677	return op;
1760	}	1678	}
…		…
1888	LOG (llevError, "Present_arch called outside map.\n");	1806	LOG (llevError, "Present_arch called outside map.\n");
1889	return NULL;	1807	return NULL;
1890	}	1808	}
1891		1809
1892	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1810	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1893	if (tmp->arch == at)	1811	if (tmp->arch->archname == at->archname)
1894	return tmp;	1812	return tmp;
1895		1813
1896	return NULL;	1814	return NULL;
1897	}	1815	}
1898		1816
…		…
1962	* The first matching object is returned, or NULL if none.	1880	* The first matching object is returned, or NULL if none.
1963	*/	1881	*/
1964	object *	1882	object *
1965	present_arch_in_ob (const archetype *at, const object *op)	1883	present_arch_in_ob (const archetype *at, const object *op)
1966	{	1884	{
1967	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1968	if (tmp->arch == at)	1886	if (tmp->arch->archname == at->archname)
1969	return tmp;	1887	return tmp;
1970		1888
1971	return NULL;	1889	return NULL;
1972	}	1890	}
1973		1891
…		…
1975	* activate recursively a flag on an object inventory	1893	* activate recursively a flag on an object inventory
1976	*/	1894	*/
1977	void	1895	void
1978	flag_inv (object *op, int flag)	1896	flag_inv (object *op, int flag)
1979	{	1897	{
1980	if (op->inv)
1981	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1982	{	1899	{
1983	SET_FLAG (tmp, flag);	1900	SET_FLAG (tmp, flag);
1984	flag_inv (tmp, flag);	1901	flag_inv (tmp, flag);
1985	}	1902	}
1986	}	1903	}
1987		1904
1988	/*	1905	/*
1989	* deactivate recursively a flag on an object inventory	1906	* deactivate recursively a flag on an object inventory
1990	*/	1907	*/
1991	void	1908	void
1992	unflag_inv (object *op, int flag)	1909	unflag_inv (object *op, int flag)
1993	{	1910	{
1994	if (op->inv)
1995	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1911	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1996	{	1912	{
1997	CLEAR_FLAG (tmp, flag);	1913	CLEAR_FLAG (tmp, flag);
1998	unflag_inv (tmp, flag);	1914	unflag_inv (tmp, flag);
1999	}	1915	}
2000	}	1916	}
2001		1917
2002	/*	1918	/*
2003	* find_free_spot(object, map, x, y, start, stop) will search for	1919	* find_free_spot(object, map, x, y, start, stop) will search for
2004	* a spot at the given map and coordinates which will be able to contain	1920	* a spot at the given map and coordinates which will be able to contain
…		…
2006	* to search (see the freearr_x/y[] definition).	1922	* to search (see the freearr_x/y[] definition).
2007	* It returns a random choice among the alternatives found.	1923	* It returns a random choice among the alternatives found.
2008	* start and stop are where to start relative to the free_arr array (1,9	1924	* start and stop are where to start relative to the free_arr array (1,9
2009	* does all 4 immediate directions). This returns the index into the	1925	* does all 4 immediate directions). This returns the index into the
2010	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1926	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2011	* Note - this only checks to see if there is space for the head of the
2012	* object - if it is a multispace object, this should be called for all
2013	* pieces.
2014	* Note2: This function does correctly handle tiled maps, but does not	1927	* Note: This function does correctly handle tiled maps, but does not
2015	* inform the caller. However, insert_ob_in_map will update as	1928	* inform the caller. However, insert_ob_in_map will update as
2016	* necessary, so the caller shouldn't need to do any special work.	1929	* necessary, so the caller shouldn't need to do any special work.
2017	* Note - updated to take an object instead of archetype - this is necessary	1930	* Note - updated to take an object instead of archetype - this is necessary
2018	* because arch_blocked (now ob_blocked) needs to know the movement type	1931	* because arch_blocked (now ob_blocked) needs to know the movement type
2019	* to know if the space in question will block the object. We can't use	1932	* to know if the space in question will block the object. We can't use
…		…
2021	* customized, changed states, etc.	1934	* customized, changed states, etc.
2022	*/	1935	*/
2023	int	1936	int
2024	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1937	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2025	{	1938	{
		1939	int altern[SIZEOFFREE];
2026	int index = 0, flag;	1940	int index = 0, flag;
2027	int altern[SIZEOFFREE];
2028		1941
2029	for (int i = start; i < stop; i++)	1942	for (int i = start; i < stop; i++)
2030	{	1943	{
2031	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1944	mapxy pos (m, x, y); pos.move (i);
2032	if (!flag)	1945
		1946	if (!pos.normalise ())
		1947	continue;
		1948
		1949	mapspace &ms = *pos;
		1950
		1951	if (ms.flags () & P_IS_ALIVE)
		1952	continue;
		1953
		1954	/* However, often
		1955	* ob doesn't have any move type (when used to place exits)
		1956	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1957	*/
		1958	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1959	{
2033	altern [index++] = i;	1960	altern [index++] = i;
		1961	continue;
		1962	}
2034		1963
2035	/* Basically, if we find a wall on a space, we cut down the search size.	1964	/* Basically, if we find a wall on a space, we cut down the search size.
2036	* In this way, we won't return spaces that are on another side of a wall.	1965	* In this way, we won't return spaces that are on another side of a wall.
2037	* This mostly work, but it cuts down the search size in all directions -	1966	* This mostly work, but it cuts down the search size in all directions -
2038	* if the space being examined only has a wall to the north and empty	1967	* if the space being examined only has a wall to the north and empty
2039	* spaces in all the other directions, this will reduce the search space	1968	* spaces in all the other directions, this will reduce the search space
2040	* to only the spaces immediately surrounding the target area, and	1969	* to only the spaces immediately surrounding the target area, and
2041	* won't look 2 spaces south of the target space.	1970	* won't look 2 spaces south of the target space.
2042	*/	1971	*/
2043	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1972	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1973	{
2044	stop = maxfree[i];	1974	stop = maxfree[i];
		1975	continue;
		1976	}
		1977
		1978	/* Note it is intentional that we check ob - the movement type of the
		1979	* head of the object should correspond for the entire object.
		1980	*/
		1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1982	continue;
		1983
		1984	if (ob->blocked (m, pos.x, pos.y))
		1985	continue;
		1986
		1987	altern [index++] = i;
2045	}	1988	}
2046		1989
2047	if (!index)	1990	if (!index)
2048	return -1;	1991	return -1;
2049		1992
…		…
2058	*/	2001	*/
2059	int	2002	int
2060	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2003	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2061	{	2004	{
2062	for (int i = 0; i < SIZEOFFREE; i++)	2005	for (int i = 0; i < SIZEOFFREE; i++)
2063	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2006	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2064	return i;	2007	return i;
2065		2008
2066	return -1;	2009	return -1;
2067	}	2010	}
2068		2011
…		…
2345	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2288	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2346	* core dumps if they do.	2289	* core dumps if they do.
2347	*	2290	*
2348	* Add a check so we can't pick up invisible objects (0.93.8)	2291	* Add a check so we can't pick up invisible objects (0.93.8)
2349	*/	2292	*/
2350
2351	int	2293	int
2352	can_pick (const object *who, const object *item)	2294	can_pick (const object *who, const object *item)
2353	{	2295	{
2354	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2296	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2355	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2297	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2358		2300
2359	/*	2301	/*
2360	* create clone from object to another	2302	* create clone from object to another
2361	*/	2303	*/
2362	object *	2304	object *
2363	object_create_clone (object *asrc)	2305	object::deep_clone ()
2364	{	2306	{
2365	object *dst = 0, *tmp, *src, *prev, *item;	2307	assert (("deep_clone called on non-head object", is_head ()));
2366		2308
2367	if (!asrc)	2309	object *dst = clone ();
2368	return 0;
2369		2310
2370	src = asrc->head_ ();	2311	object *prev = dst;
2371
2372	prev = 0;
2373	for (object *part = src; part; part = part->more)	2312	for (object *part = this->more; part; part = part->more)
2374	{	2313	{
2375	tmp = part->clone ();	2314	object *tmp = part->clone ();
2376	tmp->x -= src->x;
2377	tmp->y -= src->y;
2378
2379	if (!part->head)
2380	{
2381	dst = tmp;
2382	tmp->head = 0;
2383	}
2384	else
2385	tmp->head = dst;	2315	tmp->head = dst;
2386
2387	tmp->more = 0;
2388
2389	if (prev)
2390	prev->more = tmp;	2316	prev->more = tmp;
2391
2392	prev = tmp;	2317	prev = tmp;
2393	}	2318	}
2394		2319
2395	for (item = src->inv; item; item = item->below)	2320	for (object *item = inv; item; item = item->below)
2396	insert_ob_in_ob (object_create_clone (item), dst);	2321	insert_ob_in_ob (item->deep_clone (), dst);
2397		2322
2398	return dst;	2323	return dst;
2399	}	2324	}
2400		2325
2401	/* This returns the first object in who's inventory that	2326	/* This returns the first object in who's inventory that
…		…
2410	return tmp;	2335	return tmp;
2411		2336
2412	return 0;	2337	return 0;
2413	}	2338	}
2414		2339
2415	/* If ob has a field named key, return the link from the list,	2340	const shstr &
2416	* otherwise return NULL.	2341	object::kv_get (const shstr &key) const
2417	*
2418	* key must be a passed in shared string - otherwise, this won't
2419	* do the desired thing.
2420	*/
2421	key_value *
2422	get_ob_key_link (const object *ob, const char *key)
2423	{	2342	{
2424	for (key_value *link = ob->key_values; link; link = link->next)	2343	for (key_value *kv = key_values; kv; kv = kv->next)
2425	if (link->key == key)	2344	if (kv->key == key)
2426	return link;
2427
2428	return 0;
2429	}
2430
2431	/*
2432	* Returns the value of op has an extra_field for key, or NULL.
2433	*
2434	* The argument doesn't need to be a shared string.
2435	*
2436	* The returned string is shared.
2437	*/
2438	const char *
2439	get_ob_key_value (const object *op, const char *const key)
2440	{
2441	key_value *link;
2442	shstr_cmp canonical_key (key);
2443
2444	if (!canonical_key)
2445	{
2446	/* 1. There being a field named key on any object
2447	* implies there'd be a shared string to find.
2448	* 2. Since there isn't, no object has this field.
2449	* 3. Therefore, *this* object doesn't have this field.
2450	*/
2451	return 0;
2452	}
2453
2454	/* This is copied from get_ob_key_link() above -
2455	* only 4 lines, and saves the function call overhead.
2456	*/
2457	for (link = op->key_values; link; link = link->next)
2458	if (link->key == canonical_key)
2459	return link->value;	2345	return kv->value;
2460		2346
2461	return 0;	2347	return shstr_null;
2462	}	2348	}
2463		2349
2464	/*	2350	void
2465	* Updates the canonical_key in op to value.	2351	object::kv_set (const shstr &key, const shstr &value)
2466	*
2467	* canonical_key is a shared string (value doesn't have to be).
2468	*
2469	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2470	* keys.
2471	*
2472	* Returns TRUE on success.
2473	*/
2474	int
2475	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2476	{	2352	{
2477	key_value *field = NULL, *last = NULL;	2353	for (key_value *kv = key_values; kv; kv = kv->next)
2478		2354	if (kv->key == key)
2479	for (field = op->key_values; field != NULL; field = field->next)
2480	{
2481	if (field->key != canonical_key)
2482	{	2355	{
2483	last = field;	2356	kv->value = value;
2484	continue;	2357	return;
2485	}	2358	}
2486		2359
2487	if (value)	2360	key_value *kv = new key_value;
2488	field->value = value;	2361
2489	else	2362	kv->next = key_values;
		2363	kv->key = key;
		2364	kv->value = value;
		2365
		2366	key_values = kv;
		2367	}
		2368
		2369	void
		2370	object::kv_del (const shstr &key)
		2371	{
		2372	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2373	if ((*kvp)->key == key)
2490	{	2374	{
2491	/* Basically, if the archetype has this key set,	2375	key_value *kv = *kvp;
2492	* we need to store the null value so when we save	2376	*kvp = (*kvp)->next;
2493	* it, we save the empty value so that when we load,	2377	delete kv;
2494	* we get this value back again.	2378	return;
2495	*/
2496	if (get_ob_key_link (op->arch, canonical_key))
2497	field->value = 0;
2498	else
2499	{
2500	if (last)
2501	last->next = field->next;
2502	else
2503	op->key_values = field->next;
2504
2505	delete field;
2506	}
2507	}	2379	}
2508	return TRUE;
2509	}
2510	/* IF we get here, key doesn't exist */
2511
2512	/* No field, we'll have to add it. */
2513
2514	if (!add_key)
2515	return FALSE;
2516
2517	/* There isn't any good reason to store a null
2518	* value in the key/value list. If the archetype has
2519	* this key, then we should also have it, so shouldn't
2520	* be here. If user wants to store empty strings,
2521	* should pass in ""
2522	*/
2523	if (value == NULL)
2524	return TRUE;
2525
2526	field = new key_value;
2527
2528	field->key = canonical_key;
2529	field->value = value;
2530	/* Usual prepend-addition. */
2531	field->next = op->key_values;
2532	op->key_values = field;
2533
2534	return TRUE;
2535	}
2536
2537	/*
2538	* Updates the key in op to value.
2539	*
2540	* If add_key is FALSE, this will only update existing keys,
2541	* and not add new ones.
2542	* In general, should be little reason FALSE is ever passed in for add_key
2543	*
2544	* Returns TRUE on success.
2545	*/
2546	int
2547	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2548	{
2549	shstr key_ (key);
2550
2551	return set_ob_key_value_s (op, key_, value, add_key);
2552	}	2380	}
2553		2381
2554	object::depth_iterator::depth_iterator (object *container)	2382	object::depth_iterator::depth_iterator (object *container)
2555	: iterator_base (container)	2383	: iterator_base (container)
2556	{	2384	{
…		…
2606	{	2434	{
2607	char flagdesc[512];	2435	char flagdesc[512];
2608	char info2[256 * 4];	2436	char info2[256 * 4];
2609	char *p = info;	2437	char *p = info;
2610		2438
2611	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2439	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2612	count, uuid.seq,	2440	count,
		2441	uuid.c_str (),
2613	&name,	2442	&name,
2614	title ? "\",title:\"" : "",	2443	title ? ",title:\"" : "",
2615	title ? (const char *)title : "",	2444	title ? (const char *)title : "",
		2445	title ? "\"" : "",
2616	flag_desc (flagdesc, 512), type);	2446	flag_desc (flagdesc, 512), type);
2617		2447
2618	if (env)	2448	if (!flag[FLAG_REMOVED] && env)
2619	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2449	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2620		2450
2621	if (map)	2451	if (map)
2622	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2452	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2623		2453
…		…
2641	}	2471	}
2642		2472
2643	const materialtype_t *	2473	const materialtype_t *
2644	object::dominant_material () const	2474	object::dominant_material () const
2645	{	2475	{
2646	if (materialtype_t *mat = name_to_material (materialname))	2476	if (materialtype_t *mt = name_to_material (materialname))
2647	return mat;	2477	return mt;
2648		2478
2649	// omfg this is slow, this has to be temporary :)
2650	shstr unknown ("unknown");
2651
2652	return name_to_material (unknown);	2479	return name_to_material (shstr_unknown);
2653	}	2480	}
2654		2481
2655	void	2482	void
2656	object::open_container (object *new_container)	2483	object::open_container (object *new_container)
2657	{	2484	{
2658	if (container == new_container)	2485	if (container == new_container)
2659	return;	2486	return;
2660		2487
2661	if (object *old_container = container)	2488	object *old_container = container;
		2489
		2490	if (old_container)
2662	{	2491	{
2663	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2492	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2664	return;	2493	return;
2665		2494
2666	#if 0	2495	#if 0
…		…
2668	if (object *closer = old_container->inv)	2497	if (object *closer = old_container->inv)
2669	if (closer->type == CLOSE_CON)	2498	if (closer->type == CLOSE_CON)
2670	closer->destroy ();	2499	closer->destroy ();
2671	#endif	2500	#endif
2672		2501
		2502	// make sure the container is available
		2503	esrv_send_item (this, old_container);
		2504
2673	old_container->flag [FLAG_APPLIED] = 0;	2505	old_container->flag [FLAG_APPLIED] = false;
2674	container = 0;	2506	container = 0;
2675		2507
		2508	// client needs item update to make it work, client bug requires this to be separate
2676	esrv_update_item (UPD_FLAGS, this, old_container);	2509	esrv_update_item (UPD_FLAGS, this, old_container);
		2510
2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2512	play_sound (sound_find ("chest_close"));
2678	}	2513	}
2679		2514
2680	if (new_container)	2515	if (new_container)
2681	{	2516	{
2682	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2517	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2693	}	2528	}
2694	#endif	2529	#endif
2695		2530
2696	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2697		2532
		2533	// make sure the container is available, client bug requires this to be separate
		2534	esrv_send_item (this, new_container);
		2535
2698	new_container->flag [FLAG_APPLIED] = 1;	2536	new_container->flag [FLAG_APPLIED] = true;
2699	container = new_container;	2537	container = new_container;
2700		2538
		2539	// client needs flag change
2701	esrv_update_item (UPD_FLAGS, this, new_container);	2540	esrv_update_item (UPD_FLAGS, this, new_container);
2702	esrv_send_inventory (this, new_container);	2541	esrv_send_inventory (this, new_container);
		2542	play_sound (sound_find ("chest_open"));
		2543	}
		2544	// else if (!old_container->env && contr && contr->ns)
		2545	// contr->ns->floorbox_reset ();
		2546	}
		2547
		2548	object *
		2549	object::force_find (const shstr name)
		2550	{
		2551	/* cycle through his inventory to look for the MARK we want to
		2552	* place
		2553	*/
		2554	for (object *tmp = inv; tmp; tmp = tmp->below)
		2555	if (tmp->type == FORCE && tmp->slaying == name)
		2556	return splay (tmp);
		2557
		2558	return 0;
		2559	}
		2560
		2561	void
		2562	object::force_add (const shstr name, int duration)
		2563	{
		2564	if (object *force = force_find (name))
		2565	force->destroy ();
		2566
		2567	object *force = get_archetype (FORCE_NAME);
		2568
		2569	force->slaying = name;
		2570	force->stats.food = 1;
		2571	force->speed_left = -1.f;
		2572
		2573	force->set_speed (duration ? 1.f / duration : 0.f);
		2574	force->flag [FLAG_IS_USED_UP] = true;
		2575	force->flag [FLAG_APPLIED] = true;
		2576
		2577	insert (force);
		2578	}
		2579
		2580	void
		2581	object::play_sound (faceidx sound)
		2582	{
		2583	if (!sound)
		2584	return;
		2585
		2586	if (flag [FLAG_REMOVED])
		2587	return;
		2588
		2589	if (env)
2703	}	2590	{
		2591	if (object *pl = in_player ())
		2592	pl->contr->play_sound (sound);
		2593	}
		2594	else
		2595	map->play_sound (sound, x, y);
2704	}	2596	}
2705		2597
2706

Diff Legend

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