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.173 by root, Sat Aug 4 22:23:47 2007 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* 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
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) 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,	13	* This program is distributed in the hope that it will be useful,
…		…
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* 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>
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>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	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,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	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
47	};	46	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	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,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	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
50	};	52	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	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,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	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
53	};	58	};
54	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	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,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	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
57	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* 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. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	143	{
140	key_value *wants_field;	144	key_value *wants_field;
141		145
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	154	key_value *has_field;
151		155
152	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
154		158
155	if (has_field == NULL)	159	if (!has_field)
156	{
157	/* No field with that name. */	160	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		161
161	/* Found the matching field. */	162	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		165
168	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
169	}	167	}
170		168
171	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	170	return 1;
173	}	171	}
174		172
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	174	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	175	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	176	{
179	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	178	* so we need to run the comparison *twice*. :(
181	*/	179	*/
…		…
202	|| ob1->speed != ob2->speed	200	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	201	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	202	|| ob1->name != ob2->name)
205	return 0;	203	return 0;
206		204
207	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	206	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	208	* nrof values.
211	*/	209	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	211	return 0;
214		212
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	214	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	215	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	216	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	217	* flags lose any meaning.
220	*/	218	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		221
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		224
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	226	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	227	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	228	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	229	|| ob1->weight != ob2->weight
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235	|| ob1->attacktype != ob2->attacktype	230	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	231	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	232	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	233	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	234	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	241	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	242	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	243	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	244	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	245	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	249	return 0;
253		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
254	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
256	*/	261	*/
257	if (ob1->inv || ob2->inv)	262	if (ob1->inv || ob2->inv)
258	{	263	{
259	/* if one object has inventory but the other doesn't, not equiv */	264	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	265	return 0; /* inventories differ in length */
261	return 0;
262		266
263	/* Now check to see if the two inventory objects could merge */	267	if (ob1->inv->below || ob2->inv->below)
		268	return 0; /* more than one object in inv */
		269
264	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	271	return 0; /* inventory objects differ */
266		272
267	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	274	* if it is valid.
269	*/	275	*/
270	}	276	}
…		…
289	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
290	return 0;	296	return 0;
291	break;	297	break;
292	}	298	}
293		299
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	300	if (ob1->key_values || ob2->key_values)
295	{	301	{
296	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	305
300	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	307	return 0;
302	}	308	}
303		309
304	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
305	{	311	{
306	ob1->optimise ();	312	ob1->optimise ();
307	ob2->optimise ();	313	ob2->optimise ();
308		314
309	if (ob1->self || ob2->self)	315	if (ob1->self || ob2->self)
		316	{
		317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		319
		320	if (k1 != k2)
		321	return 0;
		322
		323	if (k1 == 0)
		324	return 1;
		325
310	if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
311	return 0;	327	return 0;
		328	}
312	}	329	}
313		330
314	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
315	return 1;	332	return 1;
316	}	333	}
317		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container || this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
318	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
319	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
322	*/	408	*/
323	long	409	void
324	sum_weight (object *op)	410	object::update_weight ()
325	{	411	{
326	long sum;	412	sint32 sum = 0;
327	object *inv;
328		413
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
330	{	415	{
331	if (inv->inv)	416	if (op->inv)
332	sum_weight (inv);	417	op->update_weight ();
333		418
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
335	}	425	{
336
337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;	426	carrying = sum;
342		427
343	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
344	}	432	}
345		433
346	/**	434	/*
347	* Return the outermost environment object for a given object.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.
361	* The result of the dump is stored in the static global errmsg array.
362	*/	436	*/
363	char *	437	char *
364	dump_object (object *op)	438	dump_object (object *op)
365	{	439	{
366	if (!op)	440	if (!op)
…		…
374	/*	448	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	449	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	450	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	451	* If it's not a multi-object, it is returned.
378	*/	452	*/
379
380	object *	453	object *
381	get_nearest_part (object *op, const object *pl)	454	get_nearest_part (object *op, const object *pl)
382	{	455	{
383	object *tmp, *closest;	456	object *tmp, *closest;
384	int last_dist, i;	457	int last_dist, i;
385		458
386	if (op->more == NULL)	459	if (!op->more)
387	return op;	460	return op;
		461
388	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
389	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
390	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
391	return closest;	468	return closest;
392	}	469	}
393		470
394	/*	471	/*
395	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
396	*/	474	*/
397	object *	475	object *
398	find_object (tag_t i)	476	find_object (tag_t i)
399	{	477	{
400	for_all_objects (op)	478	for_all_objects (op)
…		…
420	break;	498	break;
421		499
422	return op;	500	return op;
423	}	501	}
424		502
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	503	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	504	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	505	* skill and experience objects.
		506	* ACTUALLY NO! investigate! TODO
434	*/	507	*/
435	void	508	void
436	object::set_owner (object *owner)	509	object::set_owner (object *owner)
437	{	510	{
		511	// allow objects which own objects
438	if (!owner)	512	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)	513	while (owner->owner)
449	owner = owner->owner;	514	owner = owner->owner;
		515
		516	if (flag [FLAG_FREED])
		517	{
		518	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		519	return;
		520	}
450		521
451	this->owner = owner;	522	this->owner = owner;
452	}	523	}
453		524
454	int	525	int
…		…
586	object::copy_to (object *dst)	657	object::copy_to (object *dst)
587	{	658	{
588	*dst = *this;	659	*dst = *this;
589		660
590	if (speed < 0)	661	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	662	dst->speed_left -= rndm ();
592		663
593	dst->set_speed (dst->speed);	664	dst->set_speed (dst->speed);
594	}	665	}
595		666
596	void	667	void
597	object::instantiate ()	668	object::instantiate ()
598	{	669	{
599	if (!uuid.seq) // HACK	670	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	671	uuid = UUID::gen ();
601		672
602	speed_left = -0.1f;	673	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	674	/* copy the body_info to the body_used - this is only really
604	* need for monsters, but doesn't hurt to do it for everything.	675	* need for monsters, but doesn't hurt to do it for everything.
605	* by doing so, when a monster is created, it has good starting	676	* by doing so, when a monster is created, it has good starting
…		…
764	static int object_count;	835	static int object_count;
765		836
766	void object::link ()	837	void object::link ()
767	{	838	{
768	assert (!index);//D	839	assert (!index);//D
769	uuid = gen_uuid ();	840	uuid = UUID::gen ();
770	count = ++object_count;	841	count = ++object_count;
771		842
772	refcnt_inc ();	843	refcnt_inc ();
773	objects.insert (this);	844	objects.insert (this);
774	}	845	}
…		…
847	object::destroy_inv (bool drop_to_ground)	918	object::destroy_inv (bool drop_to_ground)
848	{	919	{
849	// need to check first, because the checks below might segfault	920	// need to check first, because the checks below might segfault
850	// as we might be on an invalid mapspace and crossfire code	921	// as we might be on an invalid mapspace and crossfire code
851	// is too buggy to ensure that the inventory is empty.	922	// is too buggy to ensure that the inventory is empty.
852	// corollary: if you create arrows etc. with stuff in tis inventory,	923	// corollary: if you create arrows etc. with stuff in its inventory,
853	// cf will crash below with off-map x and y	924	// cf will crash below with off-map x and y
854	if (!inv)	925	if (!inv)
855	return;	926	return;
856		927
857	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
858	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
859	* drop on that space.	930	* drop on that space.
860	*/	931	*/
861	if (!drop_to_ground	932	if (!drop_to_ground
862	|| !map	933	|| !map
863	|| map->in_memory != MAP_IN_MEMORY	934	|| map->in_memory != MAP_ACTIVE
864	|| map->nodrop	935	|| map->nodrop
865	|| ms ().move_block == MOVE_ALL)	936	|| ms ().move_block == MOVE_ALL)
866	{	937	{
867	while (inv)	938	while (inv)
868	{	939	{
869	inv->destroy_inv (drop_to_ground);	940	inv->destroy_inv (false);
870	inv->destroy ();	941	inv->destroy ();
871	}	942	}
872	}	943	}
873	else	944	else
874	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
…		…
880	|| op->flag [FLAG_NO_DROP]	951	|| op->flag [FLAG_NO_DROP]
881	|| op->type == RUNE	952	|| op->type == RUNE
882	|| op->type == TRAP	953	|| op->type == TRAP
883	|| op->flag [FLAG_IS_A_TEMPLATE]	954	|| op->flag [FLAG_IS_A_TEMPLATE]
884	|| op->flag [FLAG_DESTROY_ON_DEATH])	955	|| op->flag [FLAG_DESTROY_ON_DEATH])
885	op->destroy ();	956	op->destroy (true);
886	else	957	else
887	map->insert (op, x, y);	958	map->insert (op, x, y);
888	}	959	}
889	}	960	}
890	}	961	}
…		…
897	}	968	}
898		969
899	void	970	void
900	object::do_destroy ()	971	object::do_destroy ()
901	{	972	{
902	attachable::do_destroy ();
903
904	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
905	remove_button_link (this);	974	remove_button_link (this);
906		975
907	if (flag [FLAG_FRIENDLY])	976	if (flag [FLAG_FRIENDLY])
908	remove_friendly_object (this);	977	remove_friendly_object (this);
909		978
910	if (!flag [FLAG_REMOVED])
911	remove ();	979	remove ();
912		980
913	destroy_inv (true);	981	attachable::do_destroy ();
914		982
915	deactivate ();	983	deactivate ();
916	unlink ();	984	unlink ();
917		985
918	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
…		…
923		991
924	if (!freed_map)	992	if (!freed_map)
925	{	993	{
926	freed_map = new maptile;	994	freed_map = new maptile;
927		995
		996	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	997	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	998	freed_map->width = 3;
930	freed_map->height = 3;	999	freed_map->height = 3;
		1000	freed_map->nodrop = 1;
931		1001
932	freed_map->alloc ();	1002	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;	1003	freed_map->in_memory = MAP_ACTIVE;
934	}	1004	}
935		1005
936	map = freed_map;	1006	map = freed_map;
937	x = 1;	1007	x = 1;
938	y = 1;	1008	y = 1;
…		…
957	object::destroy (bool destroy_inventory)	1027	object::destroy (bool destroy_inventory)
958	{	1028	{
959	if (destroyed ())	1029	if (destroyed ())
960	return;	1030	return;
961		1031
		1032	if (!is_head () && !head->destroyed ())
		1033	{
		1034	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1035	head->destroy (destroy_inventory);
		1036	}
		1037
962	if (destroy_inventory)	1038	destroy_inv (!destroy_inventory);
963	destroy_inv (false);
964		1039
965	if (is_head ())	1040	if (is_head ())
966	if (sound_destroy)	1041	if (sound_destroy)
967	play_sound (sound_destroy);	1042	play_sound (sound_destroy);
968	else if (flag [FLAG_MONSTER])	1043	else if (flag [FLAG_MONSTER])
969	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1044	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
970		1045
971	attachable::destroy ();	1046	attachable::destroy ();
972	}
973
974	/*
975	* sub_weight() recursively (outwards) subtracts a number from the
976	* weight of an object (and what is carried by it's environment(s)).
977	*/
978	void
979	sub_weight (object *op, signed long weight)
980	{
981	while (op != NULL)
982	{
983	if (op->type == CONTAINER)
984	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
985
986	op->carrying -= weight;
987	op = op->env;
988	}
989	}	1047	}
990		1048
991	/* op->remove ():	1049	/* op->remove ():
992	* This function removes the object op from the linked list of objects	1050	* This function removes the object op from the linked list of objects
993	* which it is currently tied to. When this function is done, the	1051	* which it is currently tied to. When this function is done, the
…		…
999	object::do_remove ()	1057	object::do_remove ()
1000	{	1058	{
1001	object *tmp, *last = 0;	1059	object *tmp, *last = 0;
1002	object *otmp;	1060	object *otmp;
1003		1061
1004	if (QUERY_FLAG (this, FLAG_REMOVED))	1062	if (flag [FLAG_REMOVED])
1005	return;	1063	return;
1006		1064
1007	SET_FLAG (this, FLAG_REMOVED);
1008	INVOKE_OBJECT (REMOVE, this);	1065	INVOKE_OBJECT (REMOVE, this);
		1066
		1067	flag [FLAG_REMOVED] = true;
1009		1068
1010	if (more)	1069	if (more)
1011	more->remove ();	1070	more->remove ();
1012		1071
1013	/*	1072	/*
1014	* In this case, the object to be removed is in someones	1073	* In this case, the object to be removed is in someones
1015	* inventory.	1074	* inventory.
1016	*/	1075	*/
1017	if (env)	1076	if (env)
1018	{	1077	{
		1078	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1079	if (object *pl = visible_to ())
		1080	esrv_del_item (pl->contr, count);
		1081	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1082
		1083	adjust_weight (env, -total_weight ());
		1084
		1085	*(above ? &above->below : &env->inv) = below;
		1086
1019	if (nrof)	1087	if (below)
1020	sub_weight (env, weight * nrof);	1088	below->above = above;
1021	else	1089
1022	sub_weight (env, weight + carrying);	1090	/* we set up values so that it could be inserted into
		1091	* the map, but we don't actually do that - it is up
		1092	* to the caller to decide what we want to do.
		1093	*/
		1094	map = env->map;
		1095	x = env->x;
		1096	y = env->y;
		1097	above = 0;
		1098	below = 0;
		1099	env = 0;
1023		1100
1024	/* NO_FIX_PLAYER is set when a great many changes are being	1101	/* NO_FIX_PLAYER is set when a great many changes are being
1025	* made to players inventory. If set, avoiding the call	1102	* made to players inventory. If set, avoiding the call
1026	* to save cpu time.	1103	* to save cpu time.
1027	*/	1104	*/
1028	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1105	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1029	otmp->update_stats ();	1106	otmp->update_stats ();
1030
1031	if (above)
1032	above->below = below;
1033	else
1034	env->inv = below;
1035
1036	if (below)
1037	below->above = above;
1038
1039	/* we set up values so that it could be inserted into
1040	* the map, but we don't actually do that - it is up
1041	* to the caller to decide what we want to do.
1042	*/
1043	x = env->x, y = env->y;
1044	map = env->map;
1045	above = 0, below = 0;
1046	env = 0;
1047	}	1107	}
1048	else if (map)	1108	else if (map)
1049	{	1109	{
1050	if (type == PLAYER)
1051	{
1052	// leaving a spot always closes any open container on the ground
1053	if (container && !container->env)
1054	// this causes spurious floorbox updates, but it ensures
1055	// that the CLOSE event is being sent.
1056	close_container ();
1057
1058	--map->players;
1059	map->touch ();
1060	}
1061
1062	map->dirty = true;	1110	map->dirty = true;
1063	mapspace &ms = this->ms ();	1111	mapspace &ms = this->ms ();
		1112
		1113	if (object *pl = ms.player ())
		1114	{
		1115	if (type == PLAYER) // this == pl(!)
		1116	{
		1117	// leaving a spot always closes any open container on the ground
		1118	if (container && !container->env)
		1119	// this causes spurious floorbox updates, but it ensures
		1120	// that the CLOSE event is being sent.
		1121	close_container ();
		1122
		1123	--map->players;
		1124	map->touch ();
		1125	}
		1126	else if (pl->container == this)
		1127	{
		1128	// removing a container should close it
		1129	close_container ();
		1130	}
		1131
		1132	esrv_del_item (pl->contr, count);
		1133	}
1064		1134
1065	/* link the object above us */	1135	/* link the object above us */
1066	if (above)	1136	if (above)
1067	above->below = below;	1137	above->below = below;
1068	else	1138	else
…		…
1089	if (map->in_memory == MAP_SAVING)	1159	if (map->in_memory == MAP_SAVING)
1090	return;	1160	return;
1091		1161
1092	int check_walk_off = !flag [FLAG_NO_APPLY];	1162	int check_walk_off = !flag [FLAG_NO_APPLY];
1093		1163
		1164	if (object *pl = ms.player ())
		1165	{
		1166	if (pl->container == this)
		1167	/* If a container that the player is currently using somehow gets
		1168	* removed (most likely destroyed), update the player view
		1169	* appropriately.
		1170	*/
		1171	pl->close_container ();
		1172
		1173	//TODO: the floorbox prev/next might need updating
		1174	esrv_del_item (pl->contr, count);
		1175	}
		1176
1094	for (tmp = ms.bot; tmp; tmp = tmp->above)	1177	for (tmp = ms.bot; tmp; tmp = tmp->above)
1095	{	1178	{
1096	/* No point updating the players look faces if he is the object	1179	/* No point updating the players look faces if he is the object
1097	* being removed.	1180	* being removed.
1098	*/	1181	*/
1099
1100	if (tmp->type == PLAYER && tmp != this)
1101	{
1102	/* If a container that the player is currently using somehow gets
1103	* removed (most likely destroyed), update the player view
1104	* appropriately.
1105	*/
1106	if (tmp->container == this)
1107	{
1108	flag [FLAG_APPLIED] = 0;
1109	tmp->container = 0;
1110	}
1111
1112	if (tmp->contr->ns)
1113	tmp->contr->ns->floorbox_update ();
1114	}
1115		1182
1116	/* See if object moving off should effect something */	1183	/* See if object moving off should effect something */
1117	if (check_walk_off	1184	if (check_walk_off
1118	&& ((move_type & tmp->move_off)	1185	&& ((move_type & tmp->move_off)
1119	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1186	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1151	merge_ob (object *op, object *top)	1218	merge_ob (object *op, object *top)
1152	{	1219	{
1153	if (!op->nrof)	1220	if (!op->nrof)
1154	return 0;	1221	return 0;
1155		1222
1156	if (top)	1223	if (!top)
1157	for (top = op; top && top->above; top = top->above)	1224	for (top = op; top && top->above; top = top->above)
1158	;	1225	;
1159		1226
1160	for (; top; top = top->below)	1227	for (; top; top = top->below)
1161	{
1162	if (top == op)
1163	continue;
1164
1165	if (object::can_merge (op, top))	1228	if (object::can_merge (op, top))
1166	{	1229	{
1167	top->nrof += op->nrof;	1230	top->nrof += op->nrof;
1168		1231
1169	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1232	if (object *pl = top->visible_to ())
1170	op->weight = 0; /* Don't want any adjustements now */	1233	esrv_update_item (UPD_NROF, pl, top);
		1234
		1235	op->weight = 0; // cancel the addition above
		1236	op->carrying = 0; // must be 0 already
		1237
1171	op->destroy ();	1238	op->destroy (1);
		1239
1172	return top;	1240	return top;
1173	}	1241	}
1174	}
1175		1242
1176	return 0;	1243	return 0;
1177	}	1244	}
1178		1245
1179	void	1246	void
…		…
1238	object *	1305	object *
1239	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1306	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1240	{	1307	{
1241	assert (!op->flag [FLAG_FREED]);	1308	assert (!op->flag [FLAG_FREED]);
1242		1309
1243	object *top, *floor = NULL;
1244
1245	op->remove ();	1310	op->remove ();
1246
1247	#if 0
1248	if (!m->active != !op->active)
1249	if (m->active)
1250	op->activate_recursive ();
1251	else
1252	op->deactivate_recursive ();
1253	#endif
1254
1255	if (out_of_map (m, op->x, op->y))
1256	{
1257	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1258	#ifdef MANY_CORES
1259	/* Better to catch this here, as otherwise the next use of this object
1260	* is likely to cause a crash. Better to find out where it is getting
1261	* improperly inserted.
1262	*/
1263	abort ();
1264	#endif
1265	return op;
1266	}
1267
1268	if (object *more = op->more)
1269	if (!insert_ob_in_map (more, m, originator, flag))
1270	return 0;
1271
1272	CLEAR_FLAG (op, FLAG_REMOVED);
1273		1311
1274	/* Ideally, the caller figures this out. However, it complicates a lot	1312	/* Ideally, the caller figures this out. However, it complicates a lot
1275	* of areas of callers (eg, anything that uses find_free_spot would now	1313	* of areas of callers (eg, anything that uses find_free_spot would now
1276	* need extra work	1314	* need extra work
1277	*/	1315	*/
1278	if (!xy_normalise (m, op->x, op->y))	1316	if (!xy_normalise (m, op->x, op->y))
		1317	{
		1318	op->destroy (1);
1279	return 0;	1319	return 0;
		1320	}
		1321
		1322	if (object *more = op->more)
		1323	if (!insert_ob_in_map (more, m, originator, flag))
		1324	return 0;
		1325
		1326	CLEAR_FLAG (op, FLAG_REMOVED);
1280		1327
1281	op->map = m;	1328	op->map = m;
1282	mapspace &ms = op->ms ();	1329	mapspace &ms = op->ms ();
1283		1330
1284	/* this has to be done after we translate the coordinates.	1331	/* this has to be done after we translate the coordinates.
1285	*/	1332	*/
1286	if (op->nrof && !(flag & INS_NO_MERGE))	1333	if (op->nrof && !(flag & INS_NO_MERGE))
1287	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1334	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1288	if (object::can_merge (op, tmp))	1335	if (object::can_merge (op, tmp))
1289	{	1336	{
		1337	// TODO: we atcually want to update tmp, not op,
		1338	// but some caller surely breaks when we return tmp
		1339	// from here :/
1290	op->nrof += tmp->nrof;	1340	op->nrof += tmp->nrof;
1291	tmp->destroy ();	1341	tmp->destroy (1);
1292	}	1342	}
1293		1343
1294	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1344	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1295	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1345	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1296		1346
…		…
1316	/* since *below* originator, no need to update top */	1366	/* since *below* originator, no need to update top */
1317	originator->below = op;	1367	originator->below = op;
1318	}	1368	}
1319	else	1369	else
1320	{	1370	{
		1371	object *top, *floor = NULL;
		1372
1321	top = ms.bot;	1373	top = ms.bot;
1322		1374
1323	/* If there are other objects, then */	1375	/* If there are other objects, then */
1324	if ((!(flag & INS_MAP_LOAD)) && top)	1376	if (top)
1325	{	1377	{
1326	object *last = 0;	1378	object *last = 0;
1327		1379
1328	/*	1380	/*
1329	* If there are multiple objects on this space, we do some trickier handling.	1381	* If there are multiple objects on this space, we do some trickier handling.
…		…
1381	*/	1433	*/
1382	if (last && last->below && last != floor)	1434	if (last && last->below && last != floor)
1383	top = last->below;	1435	top = last->below;
1384	}	1436	}
1385	} /* If objects on this space */	1437	} /* If objects on this space */
1386	if (flag & INS_MAP_LOAD)
1387	top = ms.top;
1388		1438
1389	if (flag & INS_ABOVE_FLOOR_ONLY)	1439	if (flag & INS_ABOVE_FLOOR_ONLY)
1390	top = floor;	1440	top = floor;
1391		1441
1392	/* Top is the object that our object (op) is going to get inserted above.	1442	/* Top is the object that our object (op) is going to get inserted above.
…		…
1425	op->map->touch ();	1475	op->map->touch ();
1426	}	1476	}
1427		1477
1428	op->map->dirty = true;	1478	op->map->dirty = true;
1429		1479
1430	/* If we have a floor, we know the player, if any, will be above
1431	* it, so save a few ticks and start from there.
1432	*/
1433	if (!(flag & INS_MAP_LOAD))
1434	if (object *pl = ms.player ())	1480	if (object *pl = ms.player ())
1435	if (pl->contr->ns)	1481	//TODO: the floorbox prev/next might need updating
1436	pl->contr->ns->floorbox_update ();	1482	esrv_send_item (pl, op);
1437		1483
1438	/* If this object glows, it may affect lighting conditions that are	1484	/* If this object glows, it may affect lighting conditions that are
1439	* visible to others on this map. But update_all_los is really	1485	* visible to others on this map. But update_all_los is really
1440	* an inefficient way to do this, as it means los for all players	1486	* an inefficient way to do this, as it means los for all players
1441	* on the map will get recalculated. The players could very well	1487	* on the map will get recalculated. The players could very well
…		…
1483	* op is the object to insert it under: supplies x and the map.	1529	* op is the object to insert it under: supplies x and the map.
1484	*/	1530	*/
1485	void	1531	void
1486	replace_insert_ob_in_map (const char *arch_string, object *op)	1532	replace_insert_ob_in_map (const char *arch_string, object *op)
1487	{	1533	{
1488	object *tmp, *tmp1;
1489
1490	/* first search for itself and remove any old instances */	1534	/* first search for itself and remove any old instances */
1491		1535
1492	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1536	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1493	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1537	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1494	tmp->destroy ();	1538	tmp->destroy (1);
1495		1539
1496	tmp1 = arch_to_object (archetype::find (arch_string));	1540	object *tmp = arch_to_object (archetype::find (arch_string));
1497		1541
1498	tmp1->x = op->x;	1542	tmp->x = op->x;
1499	tmp1->y = op->y;	1543	tmp->y = op->y;
		1544
1500	insert_ob_in_map (tmp1, op->map, op, 0);	1545	insert_ob_in_map (tmp, op->map, op, 0);
1501	}	1546	}
1502		1547
1503	object *	1548	object *
1504	object::insert_at (object *where, object *originator, int flags)	1549	object::insert_at (object *where, object *originator, int flags)
1505	{	1550	{
		1551	if (where->env)
		1552	return where->env->insert (this);
		1553	else
1506	return where->map->insert (this, where->x, where->y, originator, flags);	1554	return where->map->insert (this, where->x, where->y, originator, flags);
1507	}	1555	}
1508		1556
1509	/*	1557	/*
1510	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1511	* is returned contains nr objects, and the remaining parts contains
1512	* the rest (or is removed and freed if that number is 0).
1513	* On failure, NULL is returned, and the reason put into the
1514	* global static errmsg array.
1515	*/
1516	object *
1517	get_split_ob (object *orig_ob, uint32 nr)
1518	{
1519	object *newob;
1520	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1521
1522	if (orig_ob->nrof < nr)
1523	{
1524	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1525	return NULL;
1526	}
1527
1528	newob = object_create_clone (orig_ob);
1529
1530	if ((orig_ob->nrof -= nr) < 1)
1531	orig_ob->destroy (1);
1532	else if (!is_removed)
1533	{
1534	if (orig_ob->env != NULL)
1535	sub_weight (orig_ob->env, orig_ob->weight * nr);
1536	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1537	{
1538	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1539	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1540	return NULL;
1541	}
1542	}
1543
1544	newob->nrof = nr;
1545
1546	return newob;
1547	}
1548
1549	/*
1550	* decrease_ob_nr(object, number) decreases a specified number from	1558	* decrease(object, number) decreases a specified number from
1551	* the amount of an object. If the amount reaches 0, the object	1559	* the amount of an object. If the amount reaches 0, the object
1552	* is subsequently removed and freed.	1560	* is subsequently removed and freed.
1553	*	1561	*
1554	* Return value: 'op' if something is left, NULL if the amount reached 0	1562	* Return value: 'op' if something is left, NULL if the amount reached 0
1555	*/	1563	*/
		1564	bool
		1565	object::decrease (sint32 nr)
		1566	{
		1567	if (!nr)
		1568	return true;
		1569
		1570	nr = min (nr, nrof);
		1571
		1572	nrof -= nr;
		1573
		1574	if (nrof)
		1575	{
		1576	adjust_weight (env, -weight * nr); // carrying == 0
		1577
		1578	if (object *pl = visible_to ())
		1579	esrv_update_item (UPD_NROF, pl, this);
		1580
		1581	return true;
		1582	}
		1583	else
		1584	{
		1585	destroy (1);
		1586	return false;
		1587	}
		1588	}
		1589
		1590	/*
		1591	* split(ob,nr) splits up ob into two parts. The part which
		1592	* is returned contains nr objects, and the remaining parts contains
		1593	* the rest (or is removed and returned if that number is 0).
		1594	* On failure, NULL is returned.
		1595	*/
1556	object *	1596	object *
1557	decrease_ob_nr (object *op, uint32 i)	1597	object::split (sint32 nr)
1558	{	1598	{
1559	object *tmp;	1599	int have = number_of ();
1560		1600
1561	if (i == 0) /* objects with op->nrof require this check */	1601	if (have < nr)
1562	return op;	1602	return 0;
1563		1603	else if (have == nr)
1564	if (i > op->nrof)
1565	i = op->nrof;
1566
1567	if (QUERY_FLAG (op, FLAG_REMOVED))
1568	op->nrof -= i;
1569	else if (op->env)
1570	{	1604	{
1571	/* is this object in the players inventory, or sub container
1572	* therein?
1573	*/
1574	tmp = op->in_player ();
1575	/* nope. Is this a container the player has opened?
1576	* If so, set tmp to that player.
1577	* IMO, searching through all the players will mostly
1578	* likely be quicker than following op->env to the map,
1579	* and then searching the map for a player.
1580	*/
1581	if (!tmp)
1582	for_all_players (pl)
1583	if (pl->ob->container == op->env)
1584	{
1585	tmp = pl->ob;
1586	break;
1587	}
1588
1589	if (i < op->nrof)
1590	{
1591	sub_weight (op->env, op->weight * i);
1592	op->nrof -= i;
1593	if (tmp)
1594	esrv_send_item (tmp, op);
1595	}
1596	else
1597	{
1598	op->remove ();	1605	remove ();
1599	op->nrof = 0;	1606	return this;
1600	if (tmp)
1601	esrv_del_item (tmp->contr, op->count);
1602	}
1603	}	1607	}
1604	else	1608	else
1605	{	1609	{
1606	object *above = op->above;	1610	decrease (nr);
1607		1611
1608	if (i < op->nrof)	1612	object *op = object_create_clone (this);
1609	op->nrof -= i;	1613	op->nrof = nr;
1610	else
1611	{
1612	op->remove ();
1613	op->nrof = 0;
1614	}
1615
1616	/* Since we just removed op, op->above is null */
1617	for (tmp = above; tmp; tmp = tmp->above)
1618	if (tmp->type == PLAYER)
1619	{
1620	if (op->nrof)
1621	esrv_send_item (tmp, op);
1622	else
1623	esrv_del_item (tmp->contr, op->count);
1624	}
1625	}
1626
1627	if (op->nrof)
1628	return op;	1614	return op;
1629	else
1630	{
1631	op->destroy ();
1632	return 0;
1633	}
1634	}
1635
1636	/*
1637	* add_weight(object, weight) adds the specified weight to an object,
1638	* and also updates how much the environment(s) is/are carrying.
1639	*/
1640	void
1641	add_weight (object *op, signed long weight)
1642	{
1643	while (op != NULL)
1644	{
1645	if (op->type == CONTAINER)
1646	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1647
1648	op->carrying += weight;
1649	op = op->env;
1650	}	1615	}
1651	}	1616	}
1652		1617
1653	object *	1618	object *
1654	insert_ob_in_ob (object *op, object *where)	1619	insert_ob_in_ob (object *op, object *where)
…		…
1679	* be != op, if items are merged. -Tero	1644	* be != op, if items are merged. -Tero
1680	*/	1645	*/
1681	object *	1646	object *
1682	object::insert (object *op)	1647	object::insert (object *op)
1683	{	1648	{
1684	object *tmp, *otmp;
1685
1686	if (!QUERY_FLAG (op, FLAG_REMOVED))
1687	op->remove ();
1688
1689	if (op->more)	1649	if (op->more)
1690	{	1650	{
1691	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1651	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1692	return op;	1652	return op;
1693	}	1653	}
1694		1654
1695	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1655	op->remove ();
1696	CLEAR_FLAG (op, FLAG_REMOVED);	1656
		1657	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1658
1697	if (op->nrof)	1659	if (op->nrof)
1698	{
1699	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1660	for (object *tmp = inv; tmp; tmp = tmp->below)
1700	if (object::can_merge (tmp, op))	1661	if (object::can_merge (tmp, op))
1701	{	1662	{
1702	/* return the original object and remove inserted object	1663	/* return the original object and remove inserted object
1703	(client needs the original object) */	1664	(client needs the original object) */
1704	tmp->nrof += op->nrof;	1665	tmp->nrof += op->nrof;
1705	/* Weight handling gets pretty funky. Since we are adding to	1666
1706	* tmp->nrof, we need to increase the weight.	1667	if (object *pl = tmp->visible_to ())
1707	*/	1668	esrv_update_item (UPD_NROF, pl, tmp);
		1669
1708	add_weight (this, op->weight * op->nrof);	1670	adjust_weight (this, op->total_weight ());
1709	SET_FLAG (op, FLAG_REMOVED);	1671
1710	op->destroy (); /* free the inserted object */	1672	op->destroy (1);
1711	op = tmp;	1673	op = tmp;
1712	op->remove (); /* and fix old object's links */	1674	goto inserted;
1713	CLEAR_FLAG (op, FLAG_REMOVED);
1714	break;
1715	}	1675	}
1716		1676
1717	/* I assume combined objects have no inventory	1677	op->owner = 0; // it's his/hers now. period.
1718	* We add the weight - this object could have just been removed
1719	* (if it was possible to merge). calling remove_ob will subtract
1720	* the weight, so we need to add it in again, since we actually do
1721	* the linking below
1722	*/
1723	add_weight (this, op->weight * op->nrof);
1724	}
1725	else
1726	add_weight (this, (op->weight + op->carrying));
1727
1728	otmp = this->in_player ();
1729	if (otmp && otmp->contr)
1730	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1731	otmp->update_stats ();
1732
1733	op->map = 0;	1678	op->map = 0;
1734	op->env = this;	1679	op->x = 0;
		1680	op->y = 0;
		1681
1735	op->above = 0;	1682	op->above = 0;
1736	op->below = 0;	1683	op->below = inv;
1737	op->x = 0, op->y = 0;	1684	op->env = this;
1738		1685
		1686	if (inv)
		1687	inv->above = op;
		1688
		1689	inv = op;
		1690
		1691	op->flag [FLAG_REMOVED] = 0;
		1692
		1693	if (object *pl = op->visible_to ())
		1694	esrv_send_item (pl, op);
		1695
		1696	adjust_weight (this, op->total_weight ());
		1697
		1698	inserted:
1739	/* reset the light list and los of the players on the map */	1699	/* reset the light list and los of the players on the map */
1740	if ((op->glow_radius != 0) && map)	1700	if (op->glow_radius && map && map->darkness)
1741	{
1742	#ifdef DEBUG_LIGHTS
1743	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1744	#endif /* DEBUG_LIGHTS */
1745	if (map->darkness)
1746	update_all_los (map, x, y);	1701	update_all_los (map, x, y);
1747	}
1748		1702
1749	/* Client has no idea of ordering so lets not bother ordering it here.	1703	// if this is a player's inventory, update stats
1750	* It sure simplifies this function...	1704	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1751	*/	1705	update_stats ();
1752	if (!inv)
1753	inv = op;
1754	else
1755	{
1756	op->below = inv;
1757	op->below->above = op;
1758	inv = op;
1759	}
1760		1706
1761	INVOKE_OBJECT (INSERT, this);	1707	INVOKE_OBJECT (INSERT, this);
1762		1708
1763	return op;	1709	return op;
1764	}	1710	}
…		…
1979	* activate recursively a flag on an object inventory	1925	* activate recursively a flag on an object inventory
1980	*/	1926	*/
1981	void	1927	void
1982	flag_inv (object *op, int flag)	1928	flag_inv (object *op, int flag)
1983	{	1929	{
1984	if (op->inv)
1985	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1930	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1986	{	1931	{
1987	SET_FLAG (tmp, flag);	1932	SET_FLAG (tmp, flag);
1988	flag_inv (tmp, flag);	1933	flag_inv (tmp, flag);
1989	}	1934	}
1990	}	1935	}
1991		1936
1992	/*	1937	/*
1993	* deactivate recursively a flag on an object inventory	1938	* deactivate recursively a flag on an object inventory
1994	*/	1939	*/
1995	void	1940	void
1996	unflag_inv (object *op, int flag)	1941	unflag_inv (object *op, int flag)
1997	{	1942	{
1998	if (op->inv)
1999	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1943	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2000	{	1944	{
2001	CLEAR_FLAG (tmp, flag);	1945	CLEAR_FLAG (tmp, flag);
2002	unflag_inv (tmp, flag);	1946	unflag_inv (tmp, flag);
2003	}	1947	}
2004	}	1948	}
2005		1949
2006	/*	1950	/*
2007	* find_free_spot(object, map, x, y, start, stop) will search for	1951	* find_free_spot(object, map, x, y, start, stop) will search for
2008	* a spot at the given map and coordinates which will be able to contain	1952	* a spot at the given map and coordinates which will be able to contain
…		…
2010	* to search (see the freearr_x/y[] definition).	1954	* to search (see the freearr_x/y[] definition).
2011	* It returns a random choice among the alternatives found.	1955	* It returns a random choice among the alternatives found.
2012	* start and stop are where to start relative to the free_arr array (1,9	1956	* start and stop are where to start relative to the free_arr array (1,9
2013	* does all 4 immediate directions). This returns the index into the	1957	* does all 4 immediate directions). This returns the index into the
2014	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1958	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2015	* Note - this only checks to see if there is space for the head of the
2016	* object - if it is a multispace object, this should be called for all
2017	* pieces.
2018	* Note2: This function does correctly handle tiled maps, but does not	1959	* Note: This function does correctly handle tiled maps, but does not
2019	* inform the caller. However, insert_ob_in_map will update as	1960	* inform the caller. However, insert_ob_in_map will update as
2020	* necessary, so the caller shouldn't need to do any special work.	1961	* necessary, so the caller shouldn't need to do any special work.
2021	* Note - updated to take an object instead of archetype - this is necessary	1962	* Note - updated to take an object instead of archetype - this is necessary
2022	* because arch_blocked (now ob_blocked) needs to know the movement type	1963	* because arch_blocked (now ob_blocked) needs to know the movement type
2023	* to know if the space in question will block the object. We can't use	1964	* to know if the space in question will block the object. We can't use
…		…
2025	* customized, changed states, etc.	1966	* customized, changed states, etc.
2026	*/	1967	*/
2027	int	1968	int
2028	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1969	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2029	{	1970	{
		1971	int altern[SIZEOFFREE];
2030	int index = 0, flag;	1972	int index = 0, flag;
2031	int altern[SIZEOFFREE];
2032		1973
2033	for (int i = start; i < stop; i++)	1974	for (int i = start; i < stop; i++)
2034	{	1975	{
2035	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1976	mapxy pos (m, x, y); pos.move (i);
2036	if (!flag)	1977
		1978	if (!pos.normalise ())
		1979	continue;
		1980
		1981	mapspace &ms = *pos;
		1982
		1983	if (ms.flags () & P_IS_ALIVE)
		1984	continue;
		1985
		1986	/* However, often
		1987	* ob doesn't have any move type (when used to place exits)
		1988	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1989	*/
		1990	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1991	{
2037	altern [index++] = i;	1992	altern [index++] = i;
		1993	continue;
		1994	}
2038		1995
2039	/* Basically, if we find a wall on a space, we cut down the search size.	1996	/* Basically, if we find a wall on a space, we cut down the search size.
2040	* In this way, we won't return spaces that are on another side of a wall.	1997	* In this way, we won't return spaces that are on another side of a wall.
2041	* This mostly work, but it cuts down the search size in all directions -	1998	* This mostly work, but it cuts down the search size in all directions -
2042	* if the space being examined only has a wall to the north and empty	1999	* if the space being examined only has a wall to the north and empty
2043	* spaces in all the other directions, this will reduce the search space	2000	* spaces in all the other directions, this will reduce the search space
2044	* to only the spaces immediately surrounding the target area, and	2001	* to only the spaces immediately surrounding the target area, and
2045	* won't look 2 spaces south of the target space.	2002	* won't look 2 spaces south of the target space.
2046	*/	2003	*/
2047	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2004	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2005	{
2048	stop = maxfree[i];	2006	stop = maxfree[i];
		2007	continue;
		2008	}
		2009
		2010	/* Note it is intentional that we check ob - the movement type of the
		2011	* head of the object should correspond for the entire object.
		2012	*/
		2013	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2014	continue;
		2015
		2016	if (ob->blocked (m, pos.x, pos.y))
		2017	continue;
		2018
		2019	altern [index++] = i;
2049	}	2020	}
2050		2021
2051	if (!index)	2022	if (!index)
2052	return -1;	2023	return -1;
2053		2024
…		…
2062	*/	2033	*/
2063	int	2034	int
2064	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2035	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2065	{	2036	{
2066	for (int i = 0; i < SIZEOFFREE; i++)	2037	for (int i = 0; i < SIZEOFFREE; i++)
2067	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2038	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2068	return i;	2039	return i;
2069		2040
2070	return -1;	2041	return -1;
2071	}	2042	}
2072		2043
…		…
2349	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2320	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2350	* core dumps if they do.	2321	* core dumps if they do.
2351	*	2322	*
2352	* Add a check so we can't pick up invisible objects (0.93.8)	2323	* Add a check so we can't pick up invisible objects (0.93.8)
2353	*/	2324	*/
2354
2355	int	2325	int
2356	can_pick (const object *who, const object *item)	2326	can_pick (const object *who, const object *item)
2357	{	2327	{
2358	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2328	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2359	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2329	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2610	{	2580	{
2611	char flagdesc[512];	2581	char flagdesc[512];
2612	char info2[256 * 4];	2582	char info2[256 * 4];
2613	char *p = info;	2583	char *p = info;
2614		2584
2615	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2585	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2616	count, uuid.seq,	2586	count,
		2587	uuid.c_str (),
2617	&name,	2588	&name,
2618	title ? "\",title:\"" : "",	2589	title ? "\",title:\"" : "",
2619	title ? (const char *)title : "",	2590	title ? (const char *)title : "",
2620	flag_desc (flagdesc, 512), type);	2591	flag_desc (flagdesc, 512), type);
2621		2592
2622	if (env)	2593	if (!flag[FLAG_REMOVED] && env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2594	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2624		2595
2625	if (map)	2596	if (map)
2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2597	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2627		2598
…		…
2657	object::open_container (object *new_container)	2628	object::open_container (object *new_container)
2658	{	2629	{
2659	if (container == new_container)	2630	if (container == new_container)
2660	return;	2631	return;
2661		2632
2662	if (object *old_container = container)	2633	object *old_container = container;
		2634
		2635	if (old_container)
2663	{	2636	{
2664	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2637	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2665	return;	2638	return;
2666		2639
2667	#if 0	2640	#if 0
…		…
2669	if (object *closer = old_container->inv)	2642	if (object *closer = old_container->inv)
2670	if (closer->type == CLOSE_CON)	2643	if (closer->type == CLOSE_CON)
2671	closer->destroy ();	2644	closer->destroy ();
2672	#endif	2645	#endif
2673		2646
		2647	// make sure the container is available
		2648	esrv_send_item (this, old_container);
		2649
2674	old_container->flag [FLAG_APPLIED] = 0;	2650	old_container->flag [FLAG_APPLIED] = false;
2675	container = 0;	2651	container = 0;
2676		2652
		2653	// client needs item update to make it work, client bug requires this to be separate
2677	esrv_update_item (UPD_FLAGS, this, old_container);	2654	esrv_update_item (UPD_FLAGS, this, old_container);
		2655
2678	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2657	play_sound (sound_find ("chest_close"));
2679	}	2658	}
2680		2659
2681	if (new_container)	2660	if (new_container)
2682	{	2661	{
2683	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2662	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2694	}	2673	}
2695	#endif	2674	#endif
2696		2675
2697	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2698		2677
		2678	// make sure the container is available, client bug requires this to be separate
		2679	esrv_send_item (this, new_container);
		2680
2699	new_container->flag [FLAG_APPLIED] = 1;	2681	new_container->flag [FLAG_APPLIED] = true;
2700	container = new_container;	2682	container = new_container;
2701		2683
		2684	// client needs flag change
2702	esrv_update_item (UPD_FLAGS, this, new_container);	2685	esrv_update_item (UPD_FLAGS, this, new_container);
2703	esrv_send_inventory (this, new_container);	2686	esrv_send_inventory (this, new_container);
		2687	play_sound (sound_find ("chest_open"));
2704	}	2688	}
		2689	// else if (!old_container->env && contr && contr->ns)
		2690	// contr->ns->floorbox_reset ();
2705	}	2691	}
2706		2692
2707	object *	2693	object *
2708	object::force_find (const shstr name)	2694	object::force_find (const shstr name)
2709	{	2695	{
…		…
2734	force->flag [FLAG_APPLIED] = true;	2720	force->flag [FLAG_APPLIED] = true;
2735		2721
2736	insert (force);	2722	insert (force);
2737	}	2723	}
2738		2724
		2725	void
		2726	object::play_sound (faceidx sound)
		2727	{
		2728	if (!sound)
		2729	return;
		2730
		2731	if (flag [FLAG_REMOVED])
		2732	return;
		2733
		2734	if (env)
		2735	{
		2736	if (object *pl = in_player ())
		2737	pl->contr->play_sound (sound);
		2738	}
		2739	else
		2740	map->play_sound (sound, x, y);
		2741	}
		2742

Diff Legend

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